feat: support acp session listing and loading by stdrc · Pull Request #456 · MoonshotAI/kimi-cli

stdrc · 2025-12-11T09:31:53Z

Related Issue

Resolve #(issue_number)

Description

Signed-off-by: Richard Chien <stdrc@outlook.com>

stdrc · 2025-12-11T09:37:04Z

This change is part of the following stack:

feat: support acp session listing and loading #456 ◀
- feat(acp): support agent plans updating #457

_{Change managed by git-spice.}

Copilot

Pull request overview

This pull request adds support for ACP session continuation by implementing session listing and loading capabilities. It introduces a new multi-session ACP server alongside the existing single-session implementation, enabling clients to discover and resume previous sessions.

Key Changes:

Adds Session.find() and Session.list() methods to enable session discovery and retrieval
Creates a new src/kimi_cli/acp/ package with a multi-session ACPServer that supports session listing and loading
Refactors the existing ACP implementation into ACPServerSingleSession for backward compatibility
Extends the Session dataclass with title and updated_at fields to support session metadata in ACP responses

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
tests/conftest.py	Updates session fixture to include new required fields (title, updated_at)
src/kimi_cli/session.py	Adds find() and list() static methods for session discovery; adds title and updated_at fields to Session dataclass; adds context file existence check in continue_()
src/kimi_cli/cli.py	Converts main command to callback to support subcommands; adds new 'acp' subcommand for multi-session server
src/kimi_cli/acp/init.py	New entry point for multi-session ACP server with unstable protocol support
src/kimi_cli/acp/types.py	Defines type aliases for ACP content blocks and MCP server types
src/kimi_cli/acp/session.py	Implements ACPSession class extracted from original ACP implementation; handles wire message streaming and conversion
src/kimi_cli/acp/server.py	Implements ACPServer with session management, listing, and loading capabilities
src/kimi_cli/acp/convert.py	Provides conversion utilities between ACP content blocks and internal content parts
src/kimi_cli/ui/acp/init.py	Refactors original ACP class to ACPServerSingleSession; maintains backward compatibility for single-session mode
pyrightconfig.json	Adds new acp package to strict type checking
CHANGELOG.md	Documents the new session continuation feature

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-12-11T09:40:38Z

src/kimi_cli/acp/convert.py

+            case acp.schema.TextContentBlock():
+                content.append(TextPart(text=block.text))
+            case acp.schema.ImageContentBlock():
+                content.append(ImageURLPart(image_url=ImageURLPart.ImageURL(url="")))  # TODO


The ImageContentBlock case creates an ImageURLPart with an empty URL string, which could cause issues downstream when the image is processed. The acp.schema.ImageContentBlock likely contains image data (either as a URL or data) that should be properly extracted and used. Additionally, according to the initialize method in init.py line 55, image capability is set to True, meaning this functionality is advertised as supported but not properly implemented.

Suggested change

content.append(ImageURLPart(image_url=ImageURLPart.ImageURL(url=""))) # TODO

# Attempt to extract image URL from the block

image_url = getattr(block, "url", None)

if image_url and isinstance(image_url, str) and image_url.strip():

content.append(ImageURLPart(image_url=ImageURLPart.ImageURL(url=image_url)))

else:

logger.warning("ImageContentBlock missing valid URL: {block}", block=block)

src/kimi_cli/ui/acp/__init__.py

Copilot · 2025-12-11T09:40:39Z

src/kimi_cli/cli.py


+@cli.command()
+def acp():
+    """Run Kimi CLI ACP server."""


The docstring for the acp subcommand is vague. It should clarify that this runs the full multi-session ACP server (as opposed to the single-session --acp mode available in the main command). Consider updating to something like "Run Kimi CLI multi-session ACP server with session listing and loading support."

Suggested change

"""Run Kimi CLI ACP server."""

"""Run Kimi CLI multi-session ACP server with session listing and loading support."""

src/kimi_cli/acp/session.py

Copilot · 2025-12-11T09:40:39Z

src/kimi_cli/acp/session.py

+            logger.warning("Max steps reached: {n_steps}", n_steps=e.n_steps)
+            return acp.PromptResponse(stop_reason="max_turn_requests")
+        except RunCancelled:
+            logger.error("Prompt cancelled by user")


The logging for RunCancelled error is inconsistent with other exception handlers. Similar to LLMNotSet, this should use logger.info() instead of logger.error() since cancellation is a normal user action, not an error condition. This is consistent with the pattern in ui/print/init.py:104 which logs "Interrupted by user" at the info level.

Suggested change

logger.error("Prompt cancelled by user")

logger.info("Prompt cancelled by user")

Copilot · 2025-12-11T09:40:40Z

src/kimi_cli/session.py

+    async def find(work_dir: KaosPath, session_id: str) -> Session | None:
+        """Find a session by work directory and session ID."""
+        work_dir = work_dir.canonical()
+        logger.debug(
+            "Finding session for work directory: {work_dir}, session ID: {session_id}",
+            work_dir=work_dir,
+            session_id=session_id,
+        )
+
+        metadata = load_metadata()
+        work_dir_meta = metadata.get_work_dir_meta(work_dir)
+        if work_dir_meta is None:
+            logger.debug("Work directory never been used")
+            return None
+
+        _migrate_session_context_file(work_dir_meta, session_id)
+
+        session_dir = work_dir_meta.sessions_dir / session_id
+        if not session_dir.is_dir():
+            logger.debug("Session directory not found: {session_dir}", session_dir=session_dir)
+            return None
+
+        context_file = session_dir / "context.jsonl"
+        if not context_file.exists():
+            logger.debug(
+                "Session context file not found: {context_file}", context_file=context_file
+            )
+            return None
+
+        return Session(
+            id=session_id,
+            work_dir=work_dir,
+            work_dir_meta=work_dir_meta,
+            context_file=context_file,
+            title=session_id,  # TODO: readable session titles
+            updated_at=context_file.stat().st_mtime,
+        )


The new Session.find() method lacks test coverage. Given that tests/test_session.py exists with test infrastructure and other session functionality would benefit from automated testing, this new method should have tests to verify it correctly handles cases like: finding an existing session, handling missing session directories, handling missing context files, and proper migration of old session files.

Copilot · 2025-12-11T09:40:40Z

src/kimi_cli/session.py

+    async def list(work_dir: KaosPath) -> list[Session]:
+        """List all sessions for a work directory."""
+        work_dir = work_dir.canonical()
+        logger.debug("Listing sessions for work directory: {work_dir}", work_dir=work_dir)
+
+        metadata = load_metadata()
+        work_dir_meta = metadata.get_work_dir_meta(work_dir)
+        if work_dir_meta is None:
+            logger.debug("Work directory never been used")
+            return []
+
+        session_ids = {
+            path.name if path.is_dir() else path.stem
+            for path in work_dir_meta.sessions_dir.iterdir()
+            if path.is_dir() or path.suffix == ".jsonl"
+        }
+
+        sessions: list[Session] = []
+        for session_id in sorted(session_ids):
+            _migrate_session_context_file(work_dir_meta, session_id)
+            session_dir = work_dir_meta.sessions_dir / session_id
+            if not session_dir.is_dir():
+                logger.debug("Session directory not found: {session_dir}", session_dir=session_dir)
+                continue
+            context_file = session_dir / "context.jsonl"
+            if not context_file.exists():
+                logger.debug(
+                    "Session context file not found: {context_file}", context_file=context_file
+                )
+                continue
+            sessions.append(
+                Session(
+                    id=session_id,
+                    work_dir=work_dir,
+                    work_dir_meta=work_dir_meta,
+                    context_file=context_file,
+                    title=session_id,  # TODO: readable session titles
+                    updated_at=context_file.stat().st_mtime,
+                )
+            )
+        return sessions


The new Session.list() method lacks test coverage. This method has complex logic including session discovery, filtering by file extensions, and migration handling. Tests should verify it correctly: lists all sessions in a directory, handles empty directories, properly migrates old session files, and correctly extracts session metadata including timestamps.

Copilot · 2025-12-11T09:40:40Z

src/kimi_cli/session.py

            work_dir_meta=work_dir_meta,
            context_file=context_file,
+            title=session_id,  # TODO: readable session titles
+            updated_at=datetime.now().timestamp(),


The updated_at timestamp should be set consistently with how it's retrieved in other methods (find, list, continue_). Those methods use context_file.stat().st_mtime, but here in create() it uses datetime.now().timestamp(). While functionally similar, this inconsistency could cause confusion. Consider creating the context_file first (via touch()) and then using its st_mtime for consistency, or document why the difference is acceptable.

Suggested change

updated_at=datetime.now().timestamp(),

updated_at=context_file.stat().st_mtime,

src/kimi_cli/acp/__init__.py

src/kimi_cli/acp/session.py

Signed-off-by: Richard Chien <stdrc@outlook.com>

stdrc added 7 commits December 11, 2025 16:52

add acp subcommand

bb8ac0f

Signed-off-by: Richard Chien <stdrc@outlook.com>

support session finding and listing

4b0b07d

Signed-off-by: Richard Chien <stdrc@outlook.com>

implement acp server with session management

092248c

Signed-off-by: Richard Chien <stdrc@outlook.com>

strict pyright

c52b40c

Signed-off-by: Richard Chien <stdrc@outlook.com>

reuse ACPSession

b471086

Signed-off-by: Richard Chien <stdrc@outlook.com>

fix ut

95b6661

Signed-off-by: Richard Chien <stdrc@outlook.com>

changelog

02838c4

Signed-off-by: Richard Chien <stdrc@outlook.com>

Copilot AI review requested due to automatic review settings December 11, 2025 09:31

stdrc mentioned this pull request Dec 11, 2025

Tracking: Full ACP support #448

Closed

8 tasks

Copilot started reviewing on behalf of stdrc December 11, 2025 09:32 View session

changelog

97c305a

Signed-off-by: Richard Chien <stdrc@outlook.com>

Copilot AI reviewed Dec 11, 2025

View reviewed changes

stdrc mentioned this pull request Dec 11, 2025

feat(acp): support agent plans updating #457

Merged

stdrc added 4 commits December 11, 2025 19:50

image url content

719ca02

Signed-off-by: Richard Chien <stdrc@outlook.com>

resolve comments

728d3fa

Signed-off-by: Richard Chien <stdrc@outlook.com>

fix check

fda4317

Signed-off-by: Richard Chien <stdrc@outlook.com>

changelog

7e1a8ea

Signed-off-by: Richard Chien <stdrc@outlook.com>

stdrc merged commit 4e4a7f9 into main Dec 11, 2025
5 checks passed

stdrc deleted the rc/acp-subcommand branch December 11, 2025 12:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support acp session listing and loading#456

feat: support acp session listing and loading#456
stdrc merged 12 commits intomainfrom
rc/acp-subcommand

stdrc commented Dec 11, 2025

Uh oh!

stdrc commented Dec 11, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Dec 11, 2025

Uh oh!

Uh oh!

Copilot AI Dec 11, 2025

Uh oh!

Uh oh!

Copilot AI Dec 11, 2025

Uh oh!

Copilot AI Dec 11, 2025

Uh oh!

Copilot AI Dec 11, 2025

Uh oh!

Copilot AI Dec 11, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

-                content.append(ImageURLPart(image_url=ImageURLPart.ImageURL(url="")))  # TODO
+                # Attempt to extract image URL from the block
+                image_url = getattr(block, "url", None)
+                if image_url and isinstance(image_url, str) and image_url.strip():
+                    content.append(ImageURLPart(image_url=ImageURLPart.ImageURL(url=image_url)))
+                else:
+                    logger.warning("ImageContentBlock missing valid URL: {block}", block=block)

	"""Run Kimi CLI ACP server."""
	"""Run Kimi CLI multi-session ACP server with session listing and loading support."""

	logger.error("Prompt cancelled by user")
	logger.info("Prompt cancelled by user")

	updated_at=datetime.now().timestamp(),
	updated_at=context_file.stat().st_mtime,

Conversation

stdrc commented Dec 11, 2025

Related Issue

Description

Uh oh!

stdrc commented Dec 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

stdrc commented Dec 11, 2025 •

edited

Loading