chore: sync portable upstream fixes for kkm 0.30.0

.changeset/agent-catalog-reload-on-miss.md

@@ -0,0 +1,6 @@
+---
+"@moonshot-ai/agent-core-v2": patch
+"@moonshot-ai/kimi-code": patch
+---
+
+Pick up agent files written after a session started: when a subagent dispatch names a profile the session catalog does not have, the agent directories are rescanned once and the lookup retried before the dispatch fails. Fixes long-lived `kimi web` sessions never seeing newly added agent Markdown files.

.changeset/bound-completed-shell-output.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Keep completed shell-command frames bounded in the terminal UI while preserving the full command output in session transcripts and exports.

.changeset/clean-tools-anthropic.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Prevent Anthropic requests from failing when MCP tools use unsupported top-level JSON Schema combinators.

.changeset/expose-hook-permission-mode.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Expose the current effective permission mode to external hooks through the optional `permission_mode` payload field.

.changeset/fix-windows-status-line-quotes.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Fix status line commands with quoted arguments on Windows.

.changeset/fresh-task-output-preview.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Keep the `/tasks` output preview fresh and show retryable output-loading errors.

.changeset/manual-permission-rules.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Fix `kimi web` honoring configured permission rules in manual mode.

.changeset/plugin-custom-agents.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": minor
+---
+
+Add support for plugin-contributed custom agents, discovered automatically and available for sub-agent delegation. Ship an `agents/` directory in the plugin (or declare `agents` paths in the plugin manifest) to provide them.

.changeset/plugin-system-prompt-section.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": minor
+---
+
+Allow enabled plugins to contribute agent system-prompt instructions through `systemPrompt` or `systemPromptPath` in `kimi.plugin.json`, effective on both agent engines (the TUI, `kimi -p`, and `kimi web`).

.changeset/reinitialize-expired-mcp-sessions.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Reinitialize expired Streamable HTTP MCP sessions and retry the interrupted tool call once when the server explicitly reports that the session is invalid.

.changeset/stream-agent-initiated-acp-turns.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Stream agent-initiated turns to connected ACP sessions, preserve live updates while resuming, and keep later prompts responsive when hooks block before a turn starts.

.changeset/task-output-nonblocking.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Remove the blocking `block`/`timeout` wait from the TaskOutput tool so checking a background task can no longer stall the conversation; it now always returns an immediate snapshot, and completion still arrives via automatic notification.

.changeset/todo-turn-end-reminder.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Nudge todo reconciliation when a turn ends with unfinished todos, instead of waiting out the 10-turn reminder cadence.

.changeset/v1-custom-agent-files.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": minor
+---
+
+Support Markdown-defined custom agents on agent-core.

.changeset/v1-secondary-model.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": minor
+---
+
+Add the /secondary_model slash command to configure the secondary model used by subagents.

.changeset/vscode-question-dialog-multi-answers.md

@@ -0,0 +1,5 @@
+---
+"kimi-code": patch
+---
+
+Fix only the first question being answerable when the agent asked multiple questions at once; each question is now answered one by one and submitted together.

.changeset/web-code-block-line-numbers.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+web: Fix code block line numbers drifting out of sync with the code lines in plain-text code blocks.

.changeset/web-ctrl-s-save-dialog.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+web: Prevent the browser Save Page dialog on Ctrl+S / Cmd+S anywhere in the app; the shortcut still steers into the running turn from the message input.

.changeset/web-full-width-chat-column.md

@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+web: Let the chat column follow the window width instead of capping it at a fixed reading width, removing the wide empty margins on large screens.

apps/kimi-code/KKM_RELEASE

@@ -1 +1 @@
-v0.29.2-kkm.2
+v0.30.0-kkm.1

apps/kimi-code/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonshot-ai/kimi-code",
-  "version": "0.29.2-kkm.2",
+  "version": "0.30.0-kkm.1",
   "description": "KKM, a portable Kimi Code fork with curated upstream fixes",
   "license": "MIT",
   "author": "Moonshot AI",

apps/kimi-code/src/cli/agent-selection.ts

@@ -0,0 +1,42 @@
+import { readFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
+
+import { parseAgentFileText, resolveAgentPath } from '@moonshot-ai/kimi-code-sdk';
+
+import type { CLIOptions } from './options';
+
+/**
+ * Resolve which agent profile the launch flags select.
+ *
+ * `--agent` carries the profile name directly; `--agent-file` implicitly
+ * selects the profile the file defines, so the file is parsed here (fatal on
+ * error) so a bad file fails before any session work. Returns undefined when
+ * neither flag is present.
+ */
+export async function resolveAgentProfileSelection(
+  opts: Pick<CLIOptions, 'agent' | 'agentFiles'>,
+  workDir: string,
+): Promise<string | undefined> {
+  if (opts.agent !== undefined) return opts.agent;
+  const agentFile = opts.agentFiles?.[0];
+  if (agentFile === undefined) return undefined;
+
+  const path = resolveAgentPath(agentFile, workDir, homedir());
+  let text: string;
+  try {
+    text = await readFile(path, 'utf8');
+  } catch (error) {
+    throw new Error(
+      `Failed to read agent file "${path}": ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error },
+    );
+  }
+  try {
+    return parseAgentFileText({ path, source: 'explicit', text }).name;
+  } catch (error) {
+    throw new Error(
+      `Invalid agent file "${path}": ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error },
+    );
+  }
+}

apps/kimi-code/src/cli/commands.ts

@@ -77,7 +77,7 @@ export function createProgram(
     .addOption(
       new Option(
         '--agent <name>',
-        'Agent profile to use for this invocation (v2 engine only). Custom profiles are discovered from agent directories or loaded via --agent-file.',
+        'Agent profile to start the new session with. Custom profiles are discovered from agent directories or loaded via --agent-file. Cannot be combined with --session/--continue.',
       )
         .argParser((value: string, previous: string | undefined) => {
           if (previous !== undefined) {
@@ -90,7 +90,7 @@ export function createProgram(
     .addOption(
       new Option(
         '--agent-file <path>',
-        'Load an agent definition from a Markdown file and select it (v2 engine only).',
+        'Load an agent definition from a Markdown file and select it for the new session. Cannot be combined with --session/--continue.',
       )
         .argParser((value: string, previous: string[] | undefined) => {
           if ((previous?.length ?? 0) > 0) {

apps/kimi-code/src/cli/options.ts

@@ -1,7 +1,3 @@
-import { CLI_COMMAND_NAME } from '#/constant/app';
-
-import { isKimiV2Enabled } from './experimental-v2';
-
 export type UIMode = 'shell' | 'print';
 export type PromptOutputFormat = 'text' | 'stream-json';
 
@@ -103,10 +99,10 @@ export function validateOptions(
   }
   if (
     (opts.agent !== undefined || opts.agentFiles.length > 0) &&
-    (!promptMode || !isKimiV2Enabled(env))
+    (opts.session !== undefined || opts.continue)
   ) {
     throw new OptionConflictError(
-      `--agent/--agent-file are only available with the v2 engine (${CLI_COMMAND_NAME} -p with KIMI_CODE_EXPERIMENTAL_FLAG=1).`,
+      'Cannot combine --agent/--agent-file with --session/--continue: the agent is bound at session creation and the bound agent is restored automatically on resume.',
     );
   }
   if (promptMode && opts.session === '') {

apps/kimi-code/src/cli/run-prompt.ts

@@ -23,6 +23,7 @@ import {
   PROMPT_CLEANUP_TIMEOUT_MS,
 } from '#/constant/app';
 
+import { resolveAgentProfileSelection } from './agent-selection';
 import { isKimiV2Enabled } from './experimental-v2';
 import { drainStdio } from './headless-exit';
 import { resolveOutputFormat } from './options';
@@ -332,6 +333,9 @@ async function resolvePromptSession(
   stderr: PromptOutput,
   setRestorePermission: (restorePermission: () => Promise<void>) => void,
 ): Promise<ResolvedPromptSession> {
+  // `--agent`/`--agent-file` are creation-only: validateOptions rejects them
+  // together with --session/--continue, so resume paths never forward a
+  // profile — the bound agent is restored from the session itself.
   if (opts.session !== undefined) {
     const sessions = await harness.listSessions({ sessionId: opts.session, workDir });
     const target = sessions[0];
@@ -401,12 +405,15 @@ async function resolvePromptSession(
     stderr.write(`No sessions to continue under "${workDir}"; starting a fresh session.\n`);
   }
 
+  const agentProfile = await resolveAgentProfileSelection(opts, workDir);
   const model = requireConfiguredModel(opts.model, defaultModel);
   const session = await harness.createSession({
     workDir,
     model,
     permission: 'auto',
     additionalDirs: opts.addDirs?.length ? opts.addDirs : undefined,
+    agentProfile,
+    agentFiles: opts.agentFiles?.length ? opts.agentFiles : undefined,
     drainAgentTasksOnStop: true,
   });
   installHeadlessHandlers(session);

apps/kimi-code/src/cli/run-shell.ts

@@ -31,6 +31,7 @@ import { toTerminalHyperlink } from '#/utils/terminal-hyperlink';
 import { restoreTerminalModes } from '#/utils/terminal-restore';
 
 import type { CLIOptions } from './options';
+import { resolveAgentProfileSelection } from './agent-selection';
 import { isKimiV2Enabled } from './experimental-v2';
 import { createCliTelemetryBootstrap, initializeCliTelemetry } from './telemetry';
 import { createKimiCodeHostIdentity } from './version';
@@ -110,8 +111,12 @@ export async function runShell(
     configWarning = combineStartupNotice(configWarning, warning);
   }
   const configMs = Date.now() - configStartedAt;
+  // Resolve --agent/--agent-file once for the startup session; validateOptions
+  // has already rejected them alongside --session/--continue.
+  const agentProfile = await resolveAgentProfileSelection(opts, workDir);
   const tui = new KimiTUI(harness, {
     cliOptions: opts,
+    agentProfile,
     additionalDirs: opts.addDirs?.length ? opts.addDirs : undefined,
     tuiConfig,
     version,

apps/kimi-code/src/cli/v2/run-v2-print.ts

@@ -324,27 +324,14 @@ async function resolveNativeSession(
     }
   }
 
-  // `--agent` / `--agent-file` bind an explicit profile; without them the
-  // historical setModel path (default profile on first bind) is kept. A
-  // same-name re-select on a resumed session keeps the profile and only applies
-  // an explicitly requested model; a different name is rejected by the
-  // engine's first-bind guard inside `bind`.
-  const applyProfileSelection = async (
+  // `--agent` / `--agent-file` are creation-only: validateOptions rejects them
+  // together with --session/--continue, so resume paths only apply an
+  // explicitly requested model — the bound profile is restored by the engine.
+  const applyModelOverride = async (
     profile: IAgentProfileService,
     model: string | undefined,
   ): Promise<void> => {
-    if (agentProfileName !== undefined) {
-      if (profile.data().profileName === agentProfileName) {
-        if (model !== undefined) await profile.setModel(model);
-        return;
-      }
-      await profile.bind({
-        profile: agentProfileName,
-        model: requireConfiguredModel(model ?? profile.getModel(), defaultModel),
-      });
-    } else if (model !== undefined) {
-      await profile.setModel(model);
-    }
+    if (model !== undefined) await profile.setModel(model);
   };
 
   const resumeById = async (id: string): Promise<ISessionScopeHandle> => {
@@ -384,7 +371,7 @@ async function resolveNativeSession(
     const session = await resumeById(opts.session);
     const agent = await ensureMainAgent(session);
     const profile = agent.accessor.get(IAgentProfileService);
-    await applyProfileSelection(profile, opts.model);
+    await applyModelOverride(profile, opts.model);
     const currentModel = profile.getModel();
     const { restorePermission } = forceAuto(agent);
     return {
@@ -403,7 +390,7 @@ async function resolveNativeSession(
       const session = await resumeById(previous.id);
       const agent = await ensureMainAgent(session);
       const profile = agent.accessor.get(IAgentProfileService);
-      await applyProfileSelection(profile, opts.model);
+      await applyModelOverride(profile, opts.model);
       const currentModel = profile.getModel();
       const { restorePermission } = forceAuto(agent);
       return {