glm-acp-agent 1.5.0 → 1.6.1

package/README.md

@@ -26,13 +26,13 @@ Built-in web tools use Coding Plan-compatible MCP endpoints, not the general `/a
 
 - **Full ACP compliance** – implements `initialize`, `authenticate`, `session/new`, `session/set_mode`, `session/prompt`, `session/cancel`, `session/close`, `session/list`, `session/load`, `session/fork`, `session/resume`, and `session/set_model`
 - **Streaming** – assistant text and reasoning tokens are forwarded as incremental ACP chunks
-- **Tool calling** – agentic loop with up to 20 turns of GLM function calling
+- **Tool calling** – agentic loop with a configurable cap of GLM function-calling turns (default 20; see `ACP_GLM_MAX_TURNS` / `--max-turns`)
 - **Thinking mode** – GLM's `reasoning_content` tokens are surfaced as `agent_thought_chunk` blocks so the client can show the model's chain of thought
 - **Session permission modes** – supports `default`, `accept_edits`, and `bypass_permissions` via `session/set_mode`. Clients like DevFlow can use this to toggle between prompting for every edit, auto-approving edits while prompting for commands, or bypassing permissions entirely.
 - **Per-session model switching** – `session/set_model` lets clients change the active GLM model mid-conversation; `session/new` returns the curated `availableModels` list
 - **Image input via Coding Plan-native vision or Vision MCP** – `promptCapabilities.image` is advertised; the advertised coding models route pasted ACP image blocks through Z.AI Vision MCP (`@z_ai/mcp-server`), while `glm-5v-turbo` sessions — opt-in via `ACP_GLM_AVAILABLE_MODELS`, since it is no longer on the Coding Plan allowlist — send supported image parts directly to the model. Direct chat-image-only models (e.g. `glm-4v-plus`) are intentionally not used.
 - **Session persistence** – conversations are written to `~/.local/state/glm-acp-agent/sessions/` and can be reloaded via `session/load`, branched via `session/fork`, or resumed without replay via `session/resume`
-- **Six built-in tools** (see below)
+- **Seven built-in tools** (see below)
 - **Self-sufficient local tools** – file reads/writes, directory listings, and shell commands run in the agent process, so they do not depend on ACP client `fs` or `terminal` capabilities
 - **Configurable permissions** – `write_file` and `run_command` behavior depends on the active session mode (prompts by default)
 - **Protocol-correct stop reasons** – maps model and runtime conditions to ACP `end_turn`, `max_tokens`, `max_turn_requests`, `refusal`, and `cancelled`
@@ -143,6 +143,7 @@ The agent reads its configuration from environment variables, plus an optional c
 | `ACP_GLM_AVAILABLE_MODELS` | No | built-in list | Comma-separated list of model ids advertised in `session/set_model` |
 | `ACP_GLM_BASE_URL` | No | `https://api.z.ai/api/coding/paas/v4` | Override the API base URL |
 | `ACP_GLM_MAX_TOKENS` | No | `8192` | Cap on `max_tokens` for each completion |
+| `ACP_GLM_MAX_TURNS` | No | `20` | Max model/tool turns per prompt (also settable via `--max-turns`) |
 | `ACP_GLM_THINKING` | No | auto-detected | Force thinking mode `true` / `false` |
 | `ACP_GLM_SESSION_DIR` | No | `$XDG_STATE_HOME/glm-acp-agent/sessions` | Where session JSON files are persisted |
 | `ACP_GLM_DEBUG` | No | — | Set to `true` or `1` to enable verbose debug logging to stderr (shows model selection, API key resolution, tool calls, and usage stats) |

package/dist/cli-args.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Parse `--max-turns <n>` (or `--max-turns=<n>`) from CLI args.
+ * Returns `undefined` only when the flag is absent; invalid input selects the
+ * default (20), never `$ACP_GLM_MAX_TURNS` — explicit-but-bad CLI input must
+ * not silently fall through to the env var.
+ */
+export declare function parseMaxTurnsFlag(argv: string[]): number | undefined;
+//# sourceMappingURL=cli-args.d.ts.map

package/dist/cli-args.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-args.d.ts","sourceRoot":"","sources":["../src/cli-args.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CA2BpE"}

package/dist/cli-args.js

@@ -0,0 +1,34 @@
+import { DEFAULT_MAX_TURNS } from "./protocol/agent.js";
+/**
+ * Parse `--max-turns <n>` (or `--max-turns=<n>`) from CLI args.
+ * Returns `undefined` only when the flag is absent; invalid input selects the
+ * default (20), never `$ACP_GLM_MAX_TURNS` — explicit-but-bad CLI input must
+ * not silently fall through to the env var.
+ */
+export function parseMaxTurnsFlag(argv) {
+    const idx = argv.indexOf("--max-turns");
+    if (idx !== -1) {
+        if (idx + 1 >= argv.length) {
+            process.stderr.write("glm-acp-agent: --max-turns requires a value\n");
+            return DEFAULT_MAX_TURNS;
+        }
+        const parsed = Number(argv[idx + 1]);
+        if (Number.isFinite(parsed) && Math.floor(parsed) >= 1) {
+            return Math.floor(parsed);
+        }
+        process.stderr.write(`glm-acp-agent: ignoring invalid --max-turns "${argv[idx + 1]}"\n`);
+        return DEFAULT_MAX_TURNS;
+    }
+    const eq = argv.find((a) => a.startsWith("--max-turns="));
+    if (eq !== undefined) {
+        const raw = eq.slice("--max-turns=".length);
+        const parsed = Number(raw);
+        if (Number.isFinite(parsed) && Math.floor(parsed) >= 1) {
+            return Math.floor(parsed);
+        }
+        process.stderr.write(`glm-acp-agent: ignoring invalid --max-turns "${raw}"\n`);
+        return DEFAULT_MAX_TURNS;
+    }
+    return undefined;
+}
+//# sourceMappingURL=cli-args.js.map

package/dist/cli-args.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-args.js","sourceRoot":"","sources":["../src/cli-args.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAc;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACxC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;QACf,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACtE,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,gDAAgD,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,CACnE,CAAC;QACF,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IACD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;IAC1D,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,GAAG,KAAK,CAAC,CAAC;QAC/E,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/index.js

@@ -10,8 +10,10 @@
  *   Z_AI_API_KEY      - API key for the Z.AI / Zhipu AI service. If unset,
  *                       falls back to the credentials file written by --setup.
  *   ACP_GLM_MODEL     - (optional) Override the default model (default: glm-5.3)
+ *   ACP_GLM_MAX_TURNS - (optional) Max model/tool turns per prompt (default: 20)
  */
 import { startConnection } from "./protocol/connection.js";
+import { parseMaxTurnsFlag } from "./cli-args.js";
 import { runSetup } from "./setup.js";
 const args = process.argv.slice(2);
 if (args.includes("--setup")) {
@@ -30,11 +32,13 @@ else if (args.includes("--help") || args.includes("-h")) {
         "Usage:",
         "  glm-acp-agent           Start the ACP stdio loop (run by an ACP client)",
         "  glm-acp-agent --setup   Interactively store your Z.AI API key on disk",
+        "  glm-acp-agent --max-turns <n>  Max model/tool turns per prompt",
         "  glm-acp-agent --help    Show this message",
         "",
         "Environment variables:",
         "  Z_AI_API_KEY                   API key (overrides the stored credentials)",
         "  ACP_GLM_MODEL                  Default model id (e.g. glm-5.3)",
+        "  ACP_GLM_MAX_TURNS              Max model/tool turns per prompt (default 20)",
         "  ACP_GLM_AVAILABLE_MODELS       Comma-separated list of advertised models",
         "  ACP_GLM_BASE_URL               Override the Z.AI API base URL",
         "  ACP_GLM_MAX_TOKENS             Per-call max output tokens (default 8192)",
@@ -47,7 +51,7 @@ else if (args.includes("--help") || args.includes("-h")) {
     process.exit(0);
 }
 else {
-    const connection = startConnection();
+    const connection = startConnection({ maxTurns: parseMaxTurnsFlag(args) });
     // Keep the process alive until the connection closes
     connection.closed
         .then(() => {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;IAC7B,QAAQ,EAAE;SACP,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC3B,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,OAAO,IAAI,CAAC,CAAC;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC;KAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAC1D,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB;QACE,uDAAuD;QACvD,EAAE;QACF,QAAQ;QACR,2EAA2E;QAC3E,yEAAyE;QACzE,6CAA6C;QAC7C,EAAE;QACF,wBAAwB;QACxB,6EAA6E;QAC7E,kEAAkE;QAClE,4EAA4E;QAC5E,iEAAiE;QACjE,4EAA4E;QAC5E,qEAAqE;QACrE,6GAA6G;QAC7G,4EAA4E;QAC5E,4FAA4F;QAC5F,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;KAAM,CAAC;IACN,MAAM,UAAU,GAAG,eAAe,EAAE,CAAC;IAErC,qDAAqD;IACrD,UAAU,CAAC,MAAM;SACd,IAAI,CAAC,GAAG,EAAE;QACT,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,OAAO,IAAI,CAAC,CAAC;QAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;IAC7B,QAAQ,EAAE;SACP,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC3B,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,OAAO,IAAI,CAAC,CAAC;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC;KAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAC1D,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB;QACE,uDAAuD;QACvD,EAAE;QACF,QAAQ;QACR,2EAA2E;QAC3E,yEAAyE;QACzE,kEAAkE;QAClE,6CAA6C;QAC7C,EAAE;QACF,wBAAwB;QACxB,6EAA6E;QAC7E,kEAAkE;QAClE,+EAA+E;QAC/E,4EAA4E;QAC5E,iEAAiE;QACjE,4EAA4E;QAC5E,qEAAqE;QACrE,6GAA6G;QAC7G,4EAA4E;QAC5E,4FAA4F;QAC5F,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;KAAM,CAAC;IACN,MAAM,UAAU,GAAG,eAAe,CAAC,EAAE,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE1E,qDAAqD;IACrD,UAAU,CAAC,MAAM;SACd,IAAI,CAAC,GAAG,EAAE;QACT,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,OAAO,IAAI,CAAC,CAAC;QAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/protocol/agent.d.ts

@@ -15,7 +15,10 @@ export interface GlmAcpAgentOptions {
     glm?: {
         streamChat: (messages: GlmMessage[], signal?: AbortSignal, options?: StreamChatOptions) => AsyncIterable<GlmStreamChunk>;
     };
-    /** Maximum number of model/tool turns per single prompt. Default 20. */
+    /**
+     * Maximum number of model/tool turns per single prompt. Default 20,
+     * overridable via `$ACP_GLM_MAX_TURNS`.
+     */
     maxTurns?: number;
     /**
      * Override the session store (used in tests). When undefined the agent
@@ -39,6 +42,7 @@ export interface GlmAcpAgentOptions {
  * GLM series models (via `GlmClient`), providing a full prompt loop with
  * tool-calling and streaming support.
  */
+export declare const DEFAULT_MAX_TURNS = 20;
 export declare class GlmAcpAgent implements Agent {
     private connection;
     private sessions;
@@ -56,8 +60,30 @@ export declare class GlmAcpAgent implements Agent {
     newSession(params: NewSessionRequest): Promise<NewSessionResponse>;
     unstable_setSessionModel(params: SetSessionModelRequest): Promise<SetSessionModelResponse>;
     /**
-     * Build the `thought_level` SessionConfigOption for the given model. The
-     * available levels depend on the model (see {@link getThoughtLevels}).
+     * Switch a session to a new model id — shared by `session/set_model` and the
+     * `model` config option. Uncatalogued ids are allowed on purpose (Z.AI may
+     * offer models we haven't catalogued), but log a stderr hint. Persists,
+     * notifies clients via `session_info_update`, and pushes a
+     * `config_option_update` because the valid thought levels may differ between
+     * models (e.g. switching from 5.3 to 4.7 drops the effort ladder).
+     */
+    private applySessionModel;
+    /**
+     * Build the SessionConfigOptions we advertise: `thought_level` (levels depend
+     * on the model, see {@link getThoughtLevels}), `mode`, and `model`.
+     *
+     * The `mode` option mirrors {@link modesState} as a `category: "mode"`
+     * selector. Clients that render config options (Zed) suppress the legacy mode
+     * selector once any config option is advertised, so the permission mode would
+     * otherwise be unreachable from their UI. `currentMode` is always read from
+     * the live session state, so a mode set through `session/set_mode` shows up
+     * here too.
+     *
+     * The `model` option mirrors {@link modelsState} as a `category: "model"`
+     * selector for the same reason: clients that render config options suppress
+     * the legacy model selector too, so the active model would otherwise be
+     * unreachable. `currentModel` is read from the live session state, so a model
+     * set through `session/set_model` shows up here as well.
      */
     private configOptionsState;
     setSessionConfigOption(params: SetSessionConfigOptionRequest): Promise<SetSessionConfigOptionResponse>;

package/dist/protocol/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/protocol/agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/protocol/agent.ts"],"names":[],"mappings":"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"}

package/dist/protocol/agent.js

@@ -20,6 +20,35 @@ import { debug, error, isDebugEnabled } from "../llm/logger.js";
  * files in their AGENTS.md.
  */
 const PROJECT_CONTEXT_CAP_CHARS = 8 * 1024;
+/**
+ * The session modes we advertise, in the order clients should display them.
+ *
+ * Single source of truth for both the ACP `modes` state (`session/set_mode`)
+ * and the `mode`-category SessionConfigOption. Clients like Zed suppress the
+ * legacy mode selector as soon as an agent advertises any config option, so
+ * the same list has to reach the UI through both channels.
+ */
+const SESSION_MODES = [
+    {
+        id: "default",
+        name: "Ask for permission",
+        description: "Prompt before edits and commands.",
+    },
+    {
+        id: "accept_edits",
+        name: "Auto-approve edits",
+        description: "Edits run without prompting. Commands still prompt.",
+    },
+    {
+        id: "bypass_permissions",
+        name: "Bypass all permissions",
+        description: "Edits and commands run without prompting.",
+    },
+];
+const SESSION_MODE_IDS = SESSION_MODES.map((mode) => mode.id);
+function isSessionModeId(value) {
+    return typeof value === "string" && SESSION_MODE_IDS.includes(value);
+}
 /**
  * Display names for thought levels shown in client UIs. Kept as an exhaustive
  * map (not capitalize-first-letter) so `xhigh` renders as "X-High" and adding
@@ -42,6 +71,25 @@ const THOUGHT_LEVEL_NAMES = {
  * GLM series models (via `GlmClient`), providing a full prompt loop with
  * tool-calling and streaming support.
  */
+export const DEFAULT_MAX_TURNS = 20;
+/**
+ * Resolve the fallback maxTurns from `$ACP_GLM_MAX_TURNS` when the caller did
+ * not pass an explicit value. Returns `undefined` when unset or invalid (the
+ * constructor then applies the default, and logs a warning on invalid input).
+ * Values that floor below 1 (e.g. 0.5) count as invalid — flooring them to 0
+ * would just be silently replaced by the default in the constructor.
+ */
+function envMaxTurns() {
+    const raw = process.env["ACP_GLM_MAX_TURNS"];
+    if (raw === undefined || raw === "")
+        return undefined;
+    const parsed = Number(raw);
+    if (!Number.isFinite(parsed) || Math.floor(parsed) < 1) {
+        process.stderr.write(`glm-acp-agent: ignoring invalid ACP_GLM_MAX_TURNS="${raw}"\n`);
+        return undefined;
+    }
+    return Math.floor(parsed);
+}
 export class GlmAcpAgent {
     connection;
     sessions = new Map();
@@ -54,11 +102,10 @@ export class GlmAcpAgent {
     constructor(connection, options = {}) {
         this.connection = connection;
         this._glm = options.glm ?? null;
-        const candidateMaxTurns = options.maxTurns ?? 20;
+        const candidateMaxTurns = options.maxTurns ?? envMaxTurns() ?? DEFAULT_MAX_TURNS;
+        const floored = Math.floor(candidateMaxTurns);
         this.maxTurns =
-            Number.isFinite(candidateMaxTurns) && candidateMaxTurns > 0
-                ? Math.floor(candidateMaxTurns)
-                : 20;
+            Number.isFinite(floored) && floored >= 1 ? floored : DEFAULT_MAX_TURNS;
         this.sessionStore =
             options.sessionStore === null
                 ? null
@@ -193,7 +240,7 @@ export class GlmAcpAgent {
             sessionId,
             models: this.modelsState(model),
             modes: this.modesState("default"),
-            configOptions: this.configOptionsState(model, thoughtLevel),
+            configOptions: this.configOptionsState(model, thoughtLevel, "default"),
         };
     }
     async unstable_setSessionModel(params) {
@@ -201,49 +248,68 @@ export class GlmAcpAgent {
         if (!session) {
             throw new Error(`Session not found: ${params.sessionId}`);
         }
+        await this.applySessionModel(params.sessionId, session, params.modelId);
+        return {};
+    }
+    /**
+     * Switch a session to a new model id — shared by `session/set_model` and the
+     * `model` config option. Uncatalogued ids are allowed on purpose (Z.AI may
+     * offer models we haven't catalogued), but log a stderr hint. Persists,
+     * notifies clients via `session_info_update`, and pushes a
+     * `config_option_update` because the valid thought levels may differ between
+     * models (e.g. switching from 5.3 to 4.7 drops the effort ladder).
+     */
+    async applySessionModel(sessionId, session, modelId) {
         const available = getAvailableModels();
-        const known = available.find((m) => m.modelId === params.modelId);
+        const known = available.find((m) => m.modelId === modelId);
         if (!known) {
-            // Allow the caller to pick any model id even if not in the curated list
-            // (Z.AI may offer models we haven't catalogued), but log a stderr hint.
-            process.stderr.write(`[glm-acp-agent] warning: model "${params.modelId}" is not in the advertised list; using as-is.\n`);
+            process.stderr.write(`[glm-acp-agent] warning: model "${modelId}" is not in the advertised list; using as-is.\n`);
         }
-        session.model = params.modelId;
-        // The valid thought levels differ per model (e.g. 5.3 offers the full
-        // effort ladder while others only offer none/on), so clamp the current
-        // level to what the new model supports.
-        session.thoughtLevel = resolveThoughtLevel(params.modelId, session.thoughtLevel);
+        session.model = modelId;
+        // The valid thought levels differ per model, so clamp the current level to
+        // what the new model supports.
+        session.thoughtLevel = resolveThoughtLevel(modelId, session.thoughtLevel);
         session.updatedAt = new Date().toISOString();
         // Persist immediately so a fork/reload before the next prompt doesn't
-        // resurrect the previous model or thought level (matches setSessionConfigOption).
-        this.persistSession(params.sessionId, session);
+        // resurrect the previous model or thought level.
+        this.persistSession(sessionId, session);
         // Notify clients so any UI that displays the active model refreshes
         // immediately, instead of waiting for the next prompt to complete.
         await safeSessionUpdate(this.connection, {
-            sessionId: params.sessionId,
+            sessionId,
             update: {
                 sessionUpdate: "session_info_update",
                 updatedAt: session.updatedAt,
             },
         });
-        // Push updated thought_level options — the set of valid levels may
-        // differ between models (e.g. switching from 5.3 to 4.7 drops the
-        // effort ladder).
         await safeSessionUpdate(this.connection, {
-            sessionId: params.sessionId,
+            sessionId,
             update: {
                 sessionUpdate: "config_option_update",
-                configOptions: this.configOptionsState(session.model, session.thoughtLevel),
+                configOptions: this.configOptionsState(session.model, session.thoughtLevel, session.mode),
             },
         });
-        return {};
     }
     /**
-     * Build the `thought_level` SessionConfigOption for the given model. The
-     * available levels depend on the model (see {@link getThoughtLevels}).
+     * Build the SessionConfigOptions we advertise: `thought_level` (levels depend
+     * on the model, see {@link getThoughtLevels}), `mode`, and `model`.
+     *
+     * The `mode` option mirrors {@link modesState} as a `category: "mode"`
+     * selector. Clients that render config options (Zed) suppress the legacy mode
+     * selector once any config option is advertised, so the permission mode would
+     * otherwise be unreachable from their UI. `currentMode` is always read from
+     * the live session state, so a mode set through `session/set_mode` shows up
+     * here too.
+     *
+     * The `model` option mirrors {@link modelsState} as a `category: "model"`
+     * selector for the same reason: clients that render config options suppress
+     * the legacy model selector too, so the active model would otherwise be
+     * unreachable. `currentModel` is read from the live session state, so a model
+     * set through `session/set_model` shows up here as well.
      */
-    configOptionsState(model, thoughtLevel) {
+    configOptionsState(model, thoughtLevel, currentMode) {
         const levels = getThoughtLevels(model);
+        const modelOptions = availableModelsWith(model);
         return [
             {
                 id: "thought_level",
@@ -257,6 +323,30 @@ export class GlmAcpAgent {
                     name: THOUGHT_LEVEL_NAMES[level],
                 })),
             },
+            {
+                id: "mode",
+                name: "Mode",
+                description: "Tool permission mode",
+                category: "mode",
+                type: "select",
+                currentValue: currentMode,
+                options: SESSION_MODES.map((mode) => ({
+                    value: mode.id,
+                    name: mode.name,
+                })),
+            },
+            {
+                id: "model",
+                name: "Model",
+                description: "GLM model for this session",
+                category: "model",
+                type: "select",
+                currentValue: model,
+                options: modelOptions.map((m) => ({
+                    value: m.modelId,
+                    name: m.name,
+                })),
+            },
         ];
     }
     async setSessionConfigOption(params) {
@@ -264,6 +354,39 @@ export class GlmAcpAgent {
         if (!session) {
             throw new Error(`Session not found: ${params.sessionId}`);
         }
+        if (params.configId === "mode") {
+            // Same reject-don't-coerce policy as thought_level below.
+            if (!isSessionModeId(params.value)) {
+                throw new Error(`Invalid mode value: ${String(params.value)}`);
+            }
+            session.mode = params.value;
+            session.updatedAt = new Date().toISOString();
+            this.persistSession(params.sessionId, session);
+            // Mirror setSessionMode so clients tracking the ACP mode state (rather
+            // than the config option) stay in sync with the dropdown.
+            await safeSessionUpdate(this.connection, {
+                sessionId: params.sessionId,
+                update: {
+                    sessionUpdate: "current_mode_update",
+                    currentModeId: session.mode,
+                },
+            });
+            return {
+                configOptions: this.configOptionsState(session.model, session.thoughtLevel, session.mode),
+            };
+        }
+        if (params.configId === "model") {
+            // Same reject-don't-coerce policy as thought_level below, but only for
+            // values that aren't model ids at all. Uncatalogued ids are allowed on
+            // purpose, mirroring unstable_setSessionModel / ACP_GLM_MODEL.
+            if (typeof params.value !== "string" || params.value.length === 0) {
+                throw new Error(`Invalid model value: ${String(params.value)}`);
+            }
+            await this.applySessionModel(params.sessionId, session, params.value);
+            return {
+                configOptions: this.configOptionsState(session.model, session.thoughtLevel, session.mode),
+            };
+        }
         if (params.configId !== "thought_level") {
             throw new Error(`Unknown config option: ${params.configId}`);
         }
@@ -280,7 +403,7 @@ export class GlmAcpAgent {
         session.updatedAt = new Date().toISOString();
         this.persistSession(params.sessionId, session);
         return {
-            configOptions: this.configOptionsState(session.model, session.thoughtLevel),
+            configOptions: this.configOptionsState(session.model, session.thoughtLevel, session.mode),
         };
     }
     /**
@@ -294,35 +417,12 @@ export class GlmAcpAgent {
      * represent the selection the agent is actually using.
      */
     modelsState(currentModelId) {
-        const available = getAvailableModels();
-        if (available.some((m) => m.modelId === currentModelId)) {
-            return { availableModels: available, currentModelId };
-        }
-        return {
-            availableModels: [...available, { modelId: currentModelId, name: currentModelId }],
-            currentModelId,
-        };
+        return { availableModels: availableModelsWith(currentModelId), currentModelId };
     }
     /** Build the SessionModeState we advertise on session create/load/resume/fork. */
     modesState(currentModeId) {
         return {
-            availableModes: [
-                {
-                    id: "default",
-                    name: "Ask for permission",
-                    description: "Prompt before edits and commands.",
-                },
-                {
-                    id: "accept_edits",
-                    name: "Auto-approve edits",
-                    description: "Edits run without prompting. Commands still prompt.",
-                },
-                {
-                    id: "bypass_permissions",
-                    name: "Bypass all permissions",
-                    description: "Edits and commands run without prompting.",
-                },
-            ],
+            availableModes: SESSION_MODES.map((mode) => ({ ...mode })),
             currentModeId,
         };
     }
@@ -331,9 +431,8 @@ export class GlmAcpAgent {
         if (!session) {
             throw new Error(`Session not found: ${params.sessionId}`);
         }
-        const validModeIds = ["default", "accept_edits", "bypass_permissions"];
-        if (!validModeIds.includes(params.modeId)) {
-            throw new Error(`Invalid modeId: ${params.modeId}. Valid modes are: ${validModeIds.join(", ")}`);
+        if (!isSessionModeId(params.modeId)) {
+            throw new Error(`Invalid modeId: ${params.modeId}. Valid modes are: ${SESSION_MODE_IDS.join(", ")}`);
         }
         const newMode = params.modeId;
         session.mode = newMode;
@@ -346,6 +445,16 @@ export class GlmAcpAgent {
                 currentModeId: newMode,
             },
         });
+        // Config options are a separate state channel: re-publish them so a mode
+        // dropdown (category "mode") doesn't keep a stale currentValue when the
+        // mode changes through the classic ACP path.
+        await safeSessionUpdate(this.connection, {
+            sessionId: params.sessionId,
+            update: {
+                sessionUpdate: "config_option_update",
+                configOptions: this.configOptionsState(session.model, session.thoughtLevel, session.mode),
+            },
+        });
         return {};
     }
     // ---------------------------------------------------------------------------
@@ -559,7 +668,7 @@ export class GlmAcpAgent {
         return {
             models: this.modelsState(persisted.model),
             modes: this.modesState(persisted.mode),
-            configOptions: this.configOptionsState(restored.model, restored.thoughtLevel),
+            configOptions: this.configOptionsState(restored.model, restored.thoughtLevel, restored.mode),
         };
     }
     async unstable_forkSession(params) {
@@ -591,7 +700,7 @@ export class GlmAcpAgent {
             sessionId: newSessionId,
             models: this.modelsState(forked.model),
             modes: this.modesState(forked.mode),
-            configOptions: this.configOptionsState(forked.model, forked.thoughtLevel),
+            configOptions: this.configOptionsState(forked.model, forked.thoughtLevel, forked.mode),
         };
     }
     async resumeSession(params) {
@@ -618,7 +727,7 @@ export class GlmAcpAgent {
         return {
             models: this.modelsState(persisted.model),
             modes: this.modesState(persisted.mode),
-            configOptions: this.configOptionsState(restored.model, restored.thoughtLevel),
+            configOptions: this.configOptionsState(restored.model, restored.thoughtLevel, restored.mode),
         };
     }
     // ---------------------------------------------------------------------------
@@ -825,7 +934,18 @@ export class GlmAcpAgent {
             // Loop and continue – GLM expects a follow-up completion now that it has
             // tool results.
         }
-        // Reached MAX_TURNS without resolution.
+        // Reached MAX_TURNS without resolution. Tell the user why we stopped —
+        // without this, hitting the cap is indistinguishable from a normal end.
+        await this.connection.sessionUpdate({
+            sessionId,
+            update: {
+                sessionUpdate: "agent_message_chunk",
+                content: {
+                    type: "text",
+                    text: `\n[stopped: reached the ${this.maxTurns}-turn limit — send a message to continue]`,
+                },
+            },
+        });
         return { stopReason: "max_turn_requests", usage: lastUsage };
     }
     mapStopReason(stopReason) {
@@ -1009,6 +1129,19 @@ function stringifyUserMessage(content) {
         .filter((text) => text.length > 0)
         .join("\n");
 }
+/**
+ * The advertised model list, always including `currentModelId` — a session
+ * restored from disk can be pinned to a de-listed id (`glm-5.2` was the
+ * previous default), and `ACP_GLM_MODEL` / `session/set_model` / the `model`
+ * config option all accept uncatalogued ids on purpose. Dropping the active id
+ * from the list would leave pickers unable to represent the selection in use.
+ */
+function availableModelsWith(currentModelId) {
+    const available = getAvailableModels();
+    return available.some((m) => m.modelId === currentModelId)
+        ? available
+        : [...available, { modelId: currentModelId, name: currentModelId }];
+}
 /**
  * Read an `AGENTS.md` (preferred) or `CLAUDE.md` from the session's cwd, returning
  * its contents capped to {@link PROJECT_CONTEXT_CAP_CHARS} characters. Read errors