teapot-coding-agent 0.37.91 → 0.37.93

package/dist/agent/agent.js

@@ -7,7 +7,6 @@ import { auditPrompt, parseAuditVerdict } from "./goal-audit.js";
 import { createCatalog } from "./tool-catalog.js";
 import { resetToolCatalog, executeTool, toolSpecs, currentSkills, safeJoin, isContextOverflow, isRequestNodeLimit, hasRunningBgShells, hasRunningBgShellsFor, killBgShells } from "./tools.js";
 import { effortChoosable } from "./llm.js";
-import { sessionTitleFrom } from "../session-title.js";
 import { mcp } from "./mcp-registry.js";
 import { flattenToolName } from "./mcp-registry.js";
 import { metaToolSpecs } from "./meta-tools.js";
@@ -298,10 +297,6 @@ export class Agent {
     skillsStamp = "";
     lastCompactSummary;
     compactRules = [];
-    setSessionTitle(title) {
-        this.sessionTitle = title?.trim() || undefined;
-    }
-    sessionTitle;
     overflowRecoveries = 0;
     consecutiveCompactFailures = 0;
     memoryDigestText() {
@@ -747,9 +742,6 @@ export class Agent {
         const last = lineage[lineage.length - 1];
         const msgs = await rebuildMessagesFrom(lineage, this.imagesDir);
         for (const e of own) {
-            if (this.sessionTitle === undefined && e.type === "prompt" && e.data?.source === "user") {
-                this.sessionTitle = sessionTitleFrom(e.data?.text) ?? undefined;
-            }
             if (e.type === "state") {
                 const d = e.data;
                 if (d.detail === "llm turn start")
@@ -1059,6 +1051,16 @@ export class Agent {
         });
     }
     snapshot() {
+        /**
+         * The session's name comes from ONE place — `config.sessionTitles`, via the resolver Master hands
+         * down. The agent used to keep its own copy, seeded at creation and never updated when the map
+         * learned the real title, so the panel showed the internal id while `config.json` had the name
+         * ("config.jsonにチャットタイトルが生成されているのに表示が内部IDになってる").
+         *
+         * A copy that has to be PUSHED is a copy that goes stale; deriving it means there is nothing to
+         * push. The session id is the fallback so the panel is never blank.
+         */
+        const title = this.opts.sessionTitleOf?.(this.currentSession) || this.currentSession;
         return {
             id: this.opts.id,
             status: this.status === "idle" && this.isLive() ? "waiting" : this.status,
@@ -1067,7 +1069,7 @@ export class Agent {
             workspace: this.workspace,
             workspaceMissing: this.isGhost,
             session: this.currentSession,
-            ...(this.sessionTitle ? { sessionTitle: this.sessionTitle } : {}),
+            ...(title ? { sessionTitle: title } : {}),
             branch: this.currentBranch,
             goal: {
                 status: this.goal.status,
@@ -1155,7 +1157,7 @@ export class Agent {
         })
             .then(() => {
             if (source === "user")
-                this.opts.onFirstUserPrompt?.(this.currentSession);
+                this.opts.onFirstUserPrompt?.(this.currentSession, text);
         })
             .then(() => bus.emit("update", { kind: "agent-update", agentId: this.opts.id }))
             .catch(() => { });

package/dist/master.js

@@ -282,32 +282,52 @@ export class Master {
             this.configDirty = true;
             return;
         }
-        this.raw.agents = this.config.agents;
-        this.raw.providers = this.config.providers;
-        this.raw.defaultProvider = this.config.defaultProvider;
-        this.raw.tasks = this.config.tasks;
-        this.raw.mcpServers = this.config.mcpServers;
-        if (this.config.sessionTitles !== undefined)
-            this.raw.sessionTitles = this.config.sessionTitles;
-        else
-            delete this.raw.sessionTitles;
-        if (this.config.customThemes !== undefined)
-            this.raw.customThemes = this.config.customThemes;
-        if (this.config.password !== undefined)
-            this.raw.password = this.config.password;
-        else
-            delete this.raw.password;
-        if (this.config.themePrefs !== undefined)
-            this.raw.themePrefs = this.config.themePrefs;
-        this.raw.resumeAfterUpdate = this.config.resumeAfterUpdate;
-        if (this.config.shortContext !== undefined)
-            this.raw.shortContext = this.config.shortContext;
-        if (this.config.pluginsDir !== undefined)
-            this.raw.pluginsDir = this.config.pluginsDir;
-        if (this.raw.progressIntervalMs === undefined && this.config.progressIntervalMs !== undefined)
-            this.raw.progressIntervalMs = this.config.progressIntervalMs;
-        if (this.raw.progressMinChars === undefined && this.config.progressMinChars !== undefined)
-            this.raw.progressMinChars = this.config.progressMinChars;
+        /**
+         * ONE list of the fields `config.json` mirrors from `this.config`.
+         *
+         * This used to be ad-hoc lines, and it was wrong in two ways that both read as "the setting does not
+         * work":
+         *
+         *   - `progressIntervalMs` / `progressMinChars` were written only when `raw` did not already have
+         *     them (`=== undefined`), so the FIRST save persisted and every later change was dropped —
+         *     reported as "progress interval (min) が機能してなくない? 少なくともconfig.jsonには書き込まれて
+         *     ない";
+         *   - `contextTokenBudget`, `contextWindowTokens`, `maxSpawnDepth`, `maxTurnsPerRound`, `onError`
+         *     and `retryDelayMs` were never written at all, so those runtime controls could not persist
+         *     either.
+         *
+         * Undefined DELETES the key rather than leaving the old value lying in the file, so clearing a
+         * control in the UI actually clears it on disk.
+         */
+        const mirrored = [
+            "agents",
+            "providers",
+            "defaultProvider",
+            "tasks",
+            "mcpServers",
+            "sessionTitles",
+            "customThemes",
+            "password",
+            "themePrefs",
+            "resumeAfterUpdate",
+            "shortContext",
+            "pluginsDir",
+            "progressIntervalMs",
+            "progressMinChars",
+            "contextTokenBudget",
+            "contextWindowTokens",
+            "maxSpawnDepth",
+            "maxTurnsPerRound",
+            "onError",
+            "retryDelayMs",
+        ];
+        for (const key of mirrored) {
+            const value = this.config[key];
+            if (value === undefined)
+                delete this.raw[key];
+            else
+                this.raw[key] = value;
+        }
         this.writeConfigAtomic(JSON.stringify(this.raw, null, 2) + "\n");
     }
     deferConfigWrites = false;
@@ -421,16 +441,13 @@ export class Master {
             this.config.contextWindowTokens =
                 (patch.contextWindowTokens ?? 0) > 0 ? patch.contextWindowTokens : undefined;
         }
-        for (const k of [
-            "contextTokenBudget", "contextWindowTokens", "maxSpawnDepth",
-            "maxTurnsPerRound", "onError", "retryDelayMs",
-        ]) {
-            const v = this.config[k];
-            if (v === undefined)
-                delete this.raw[k];
-            else
-                this.raw[k] = v;
-        }
+        /**
+         * No `this.raw[...] = v` loop here — `saveConfig()` owns the mirror now (see its `mirrored` list).
+         *
+         * There used to be one, covering six of these keys and not the other two, which is exactly how the
+         * runtime controls ended up in different states: `contextTokenBudget` persisted, `progressIntervalMs`
+         * did not. One owner, one rule — and it runs once, at the end, after `tasks` is updated too.
+         */
         if (patch.tasks) {
             this.config.tasks = patch.tasks;
             this.tasks = patch.tasks.map((t) => ({
@@ -631,9 +648,11 @@ export class Master {
         const agent = new Agent({
             id: ac.id,
             workspace: resolveWorkspace(ac.workspace, path.dirname(this.configPath)),
-            onFirstUserPrompt: (sessionId) => {
-                void this.ensureSessionTitle(ac.id, sessionId);
+            onFirstUserPrompt: (sessionId, firstText) => {
+                void this.ensureSessionTitle(ac.id, sessionId, firstText);
             },
+            // ONE owner for a session's name: this map. The agent derives it on every snapshot.
+            sessionTitleOf: (sessionId) => this.readSessionTitle(sessionId) ?? undefined,
             llm,
             sessionDir,
             // boot must touch ONLY config.json and skills; this agent's directory is opened when it is used
@@ -723,27 +742,13 @@ export class Master {
         }
         await agent.init();
         /**
-         * Seed the title from the SESSION, so a restart shows the name the operator gave it.
+         * No title is seeded, and nothing is derived here.
          *
-         * `snapshot().sessionTitle` comes from the agent's own field, and that was only ever set by
-         * `renameSession` — so after a restart the UI fell back to the auto-generated name even though the
-         * title was on disk. The title comes from `config.sessionTitles`, which is the one copy.
+         * The agent derives its name from `config.sessionTitles` on every `snapshot()` (see
+         * `sessionTitleOf`), so there is no copy to seed. Deriving a missing one here would read
+         * `chat.jsonl`, and boot must not open session directories — "起動中に読んでいいのはconfig.jsonと
+         * skillsだけ / セッションディレクトリはセッションがロードされるまで開かない".
          */
-        const seedTitle = this.readSessionTitle(path.basename(sessionDir));
-        if (seedTitle)
-            agent.setSessionTitle(seedTitle);
-        else {
-            /**
-             * NOT derived here. Deriving a missing title reads `chat.jsonl`, and boot must not open session
-             * directories at all — "起動中に読んでいいのはconfig.jsonとskillsだけ / セッションディレクトリは
-             * セッションがロードされるまで開かない".
-             *
-             * The session ID is a perfectly good fallback for the panel, and the real derivation happens
-             * when that session is actually loaded (`ensureSessionTitle`, via the agent's first prompt).
-             */
-            const id = path.basename(sessionDir);
-            agent.setSessionTitle(this.readSessionTitle(id) ?? id);
-        }
         this.agents.set(ac.id, agent);
         if (opts.persist) {
             this.config.agents.push(ac);
@@ -1088,6 +1093,17 @@ When this task is done (or truly blocked), call finish() with a summary for @${p
         }
         this.config.sessionTitles ??= {};
         this.config.sessionTitles[sessionId] = title;
+        /**
+         * …and the LIVE agent has to be told, or the panel keeps showing the id.
+         *
+         * `addAgent` seeds an agent's title from this map when it is created, falling back to the session id.
+         * A NEW session gets its entry written later (on the first prompt, from `chat.jsonl`), and nothing
+         * pushed it back — so the agent still held the id and the panel displayed it while `config.json` had
+         * the real name. Reported as "config.jsonにチャットタイトルが生成されているのに表示が内部IDになってる".
+         *
+         * Pushing here rather than in each caller means every writer (the derivation, a rename) is covered by
+         * one rule: the map changed, so the agent that is showing it changes too.
+         */
         this.saveConfig();
     }
     /**
@@ -1097,14 +1113,23 @@ When this task is done (or truly blocked), call finish() with a summary for @${p
      * per session on every call (MEASURED earlier: 0.87s for one archive toggle). Writing it down once,
      * where the session lives, keeps that scan off the hot path and keeps the answer in ONE place.
      */
-    async ensureSessionTitle(agentId, sessionId) {
+    async ensureSessionTitle(agentId, sessionId, firstText) {
         const a = this.config.agents.find((x) => x.id === agentId);
         if (!a || a.session !== sessionId)
             return;
+        // the map is the master: once it has a name, nothing may replace it
         if (this.readSessionTitle(sessionId))
             return;
-        const dir = path.join(this.sessionsRoot(), sessionId);
-        this.writeSessionTitle(sessionId, this.sessionTitleOf(dir) ?? sessionId);
+        /**
+         * A session is named from its FIRST USER MESSAGE — that is the whole point of this hook, and it must
+         * keep working for a session created at runtime.
+         *
+         * The text arrives from the agent, which already has it, so this needs no read of `chat.jsonl`. The
+         * log is only a fallback for a caller that could not supply it.
+         */
+        const fromText = sessionTitleFrom(firstText) ?? undefined;
+        const derived = fromText ?? this.sessionTitleOf(path.join(this.sessionsRoot(), sessionId)) ?? sessionId;
+        this.writeSessionTitle(sessionId, derived);
     }
     sessionTitleOf(dirPath) {
         let fd;
@@ -1338,7 +1363,7 @@ When this task is done (or truly blocked), call finish() with a summary for @${p
          */
         this.writeSessionTitle(sessionId, clean);
         delete a.sessionTitle;
-        this.agents.get(agentId)?.setSessionTitle(clean);
+        // no field to set: the panel derives the name from the map, so the bus nudge is the whole update
         bus.emit("update", { kind: "agent-update", agentId });
         return { title: clean };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teapot-coding-agent",
-  "version": "0.37.91",
+  "version": "0.37.93",
   "description": "A lightweight, always-on multi-agent harness for AI coding agents",
   "type": "module",
   "license": "AGPL-3.0-or-later",