@qwen-code/qwen-code 0.23.0 → 0.23.1-preview.1

package/chunks/{chunk-U4DJ5XB3.js → chunk-VDXYYVCD.js}

@@ -1442,6 +1442,9 @@ var GroupHistoryStore = class {
     const state = loaded.entries;
     const limits = loaded.limits;
     const current = state.get(key) ?? [];
+    if (entry.messageId !== void 0 && current.some((item) => item.messageId === entry.messageId)) {
+      return;
+    }
     current.push(entry);
     if (current.length > normalizedLimit) {
       current.splice(0, current.length - normalizedLimit);
@@ -1473,6 +1476,22 @@ var GroupHistoryStore = class {
     }
     return entries;
   }
+  forget(key, messageId) {
+    const loaded = this.loadState();
+    const current = loaded.entries.get(key);
+    if (!current)
+      return;
+    const remaining = current.filter((entry) => entry.messageId !== messageId);
+    if (remaining.length === current.length)
+      return;
+    if (remaining.length === 0) {
+      loaded.entries.delete(key);
+      loaded.limits.delete(key);
+    } else {
+      loaded.entries.set(key, remaining);
+    }
+    this.compact(loaded.entries, loaded.limits);
+  }
   clear(key) {
     const loaded = this.loadState();
     const state = loaded.entries;
@@ -1513,6 +1532,9 @@ var GroupHistoryStore = class {
         continue;
       }
       const current = state.get(record.key) ?? [];
+      if (record.entry.messageId !== void 0 && current.some((item) => item.messageId === record.entry.messageId)) {
+        continue;
+      }
       current.push(record.entry);
       if (current.length > record.limit) {
         current.splice(0, current.length - record.limit);
@@ -1709,7 +1731,7 @@ var SenderGate = class {
 // packages/channels/base/dist/SessionRouter.js
 init_esbuild_shims();
 import { chmodSync as chmodSync2, existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3, renameSync as renameSync3, rmSync, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname3, join as join4 } from "node:path";
+import { dirname as dirname3, isAbsolute, join as join4 } from "node:path";
 import process2 from "node:process";
 var SessionRouter = class {
   static {
@@ -1978,7 +2000,7 @@ var SessionRouter = class {
   getSessionCwd(sessionId) {
     return this.toCwd.get(sessionId);
   }
-  async createManagedSession(target, cwd) {
+  async createManagedSession(target, workspaceCwd, isolation = "shared") {
     const loadWindow = this.beginSessionLoad();
     const lifecycleGeneration = this.lifecycleGeneration;
     const bridge = this.bridge;
@@ -1986,9 +2008,10 @@ var SessionRouter = class {
     try {
       let lastDeadSessionId;
       for (let attempt = 0; attempt < 2; attempt++) {
-        const sessionId = await bridge.newSession(cwd, {
+        const sessionId = await bridge.newSession(workspaceCwd, {
           ...this.sessionOptions(target.channelName),
-          sourceId: target.channelName
+          sourceId: target.channelName,
+          ...isolation === "worktree" ? { worktree: {} } : {}
         }, bindingToken);
         if (lifecycleGeneration !== this.lifecycleGeneration || bridge !== this.bridge) {
           this.scheduleManagedDiscard(bridge, sessionId, bindingToken);
@@ -1997,13 +2020,20 @@ var SessionRouter = class {
         if (typeof sessionId !== "string" || sessionId.length === 0) {
           throw new Error("Invalid session ID from bridge");
         }
+        let sessionCwd;
+        try {
+          sessionCwd = this.validateManagedSessionIdentity(bridge, sessionId, workspaceCwd, void 0, isolation);
+        } catch (error) {
+          await bridge.discardSession?.(sessionId, bindingToken).catch(() => void 0);
+          throw error;
+        }
         if (loadWindow.delete(sessionId)) {
           lastDeadSessionId = sessionId;
           await bridge.discardSession?.(sessionId, bindingToken);
           continue;
         }
         this.toTarget.set(sessionId, target);
-        this.toCwd.set(sessionId, cwd);
+        this.toCwd.set(sessionId, sessionCwd);
         this.liveSessionIds.add(sessionId);
         return sessionId;
       }
@@ -2012,10 +2042,11 @@ var SessionRouter = class {
       this.endSessionLoad(loadWindow);
     }
   }
-  async loadManagedSession(sessionId, target, cwd) {
+  async loadManagedSession(sessionId, target, workspaceCwd, expectedCwd = workspaceCwd, isolation = "shared") {
     if (this.liveSessionIds.has(sessionId)) {
+      const actualCwd = this.validateManagedSessionIdentity(this.bridge, sessionId, workspaceCwd, expectedCwd, isolation);
       this.toTarget.set(sessionId, target);
-      this.toCwd.set(sessionId, cwd);
+      this.toCwd.set(sessionId, actualCwd);
       return { loaded: false };
     }
     const loadWindow = this.beginSessionLoad();
@@ -2024,7 +2055,7 @@ var SessionRouter = class {
     const bindingToken = {};
     let loadedSessionId;
     try {
-      loadedSessionId = await bridge.loadSession(sessionId, cwd, this.sessionOptions(target.channelName), bindingToken);
+      loadedSessionId = await bridge.loadSession(sessionId, workspaceCwd, this.sessionOptions(target.channelName), bindingToken);
       if (lifecycleGeneration !== this.lifecycleGeneration || bridge !== this.bridge) {
         this.scheduleManagedDiscard(bridge, loadedSessionId, bindingToken);
         loadedSessionId = void 0;
@@ -2039,8 +2070,9 @@ var SessionRouter = class {
       if (loadWindow.delete(sessionId)) {
         throw new Error(`Managed session ${sessionId} died before loading completed`);
       }
+      const actualCwd = this.validateManagedSessionIdentity(bridge, sessionId, workspaceCwd, expectedCwd, isolation);
       this.toTarget.set(sessionId, target);
-      this.toCwd.set(sessionId, cwd);
+      this.toCwd.set(sessionId, actualCwd);
       this.liveSessionIds.add(sessionId);
       return { loaded: true };
     } catch (error) {
@@ -2052,6 +2084,18 @@ var SessionRouter = class {
       this.endSessionLoad(loadWindow);
     }
   }
+  validateManagedSessionIdentity(bridge, sessionId, workspaceCwd, expectedCwd, isolation) {
+    if (isolation === "shared") {
+      return workspaceCwd;
+    }
+    const info = bridge.listSessions?.().find((candidate) => candidate.sessionId === sessionId);
+    const canonicalWorkspace = canonicalizeWorkspacePath(workspaceCwd);
+    const canonicalWorktree = info?.worktree ? canonicalizeWorkspacePath(info.worktree.path) : void 0;
+    if (!info || canonicalizeWorkspacePath(info.workspaceCwd) !== canonicalWorkspace || info.worktreeState !== "persisted-v1" || !info.worktree || !isAbsolute(info.worktree.path) || !canonicalWorktree || canonicalWorktree === canonicalWorkspace || expectedCwd !== void 0 && canonicalWorktree !== canonicalizeWorkspacePath(expectedCwd)) {
+      throw new Error(`Daemon did not attest the expected worktree for session ${sessionId}`);
+    }
+    return canonicalWorktree;
+  }
   activateManagedSession(sessionId, target, cwd) {
     const key = this.routingKey(target.channelName, target.senderId, target.chatId, target.threadId);
     if (this.toSession.get(key) === sessionId)
@@ -2515,7 +2559,7 @@ var SessionRouter = class {
 init_esbuild_shims();
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { chmodSync as chmodSync3, existsSync as existsSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync4, renameSync as renameSync4, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "node:fs";
-import { dirname as dirname4 } from "node:path";
+import { dirname as dirname4, isAbsolute as isAbsolute2 } from "node:path";
 import process3 from "node:process";
 var REGISTRY_VERSION = 1;
 var MAX_OPEN_TASKS = 8;
@@ -2642,7 +2686,7 @@ var NamedSessionManager = class {
       return true;
     });
   }
-  create(input, name) {
+  create(input, name, isolation = "shared") {
     return this.withOwnerLock(input, async () => {
       this.validateName(name);
       const existingOwner = await this.ensureOwner(input, false);
@@ -2655,12 +2699,17 @@ var NamedSessionManager = class {
       }
       const timestamp = this.nextTimestamp(owner);
       const target = this.target(input);
-      const sessionId = await this.createSession(target, this.cwd, `Could not create task "${name}".`);
+      const sessionId = await this.createSession(target, isolation, `Could not create task "${name}".`);
+      const sessionCwd = this.router.getSessionCwd(sessionId);
+      if (!sessionCwd) {
+        await this.router.detachManagedSession(sessionId).catch(() => void 0);
+        throw new Error(`Could not determine task "${name}" workspace.`);
+      }
       const task = {
         name,
         sessionId,
-        cwd: this.cwd,
-        isolation: "shared",
+        cwd: sessionCwd,
+        isolation,
         status: "open",
         target,
         createdAt: timestamp,
@@ -2678,7 +2727,7 @@ var NamedSessionManager = class {
         await this.router.detachManagedSession(sessionId).catch(() => void 0);
         throw error;
       }
-      this.router.activateManagedSession(sessionId, target, this.cwd);
+      this.router.activateManagedSession(sessionId, target, task.cwd);
       return this.selection(nextOwner, task);
     });
   }
@@ -2788,8 +2837,11 @@ var NamedSessionManager = class {
       const task = this.findTask(owner, owner.activeTaskName);
       if (!task || task.status !== "open")
         return void 0;
+      if (task.isolation === "worktree") {
+        throw new Error(`Task "${task.name}" uses a worktree and cannot be cleared or reset yet. Continue using the task or close it. Its files were not changed.`);
+      }
       const timestamp = this.nextTimestamp(owner);
-      const sessionId = await this.createSession(task.target, task.cwd, `Could not reset task "${task.name}".`);
+      const sessionId = await this.createSession(task.target, task.isolation, `Could not reset task "${task.name}".`);
       const updatedTask = {
         ...task,
         sessionId,
@@ -2847,7 +2899,7 @@ var NamedSessionManager = class {
       return void 0;
     const target = this.target(input);
     const timestamp = this.nextTimestamp();
-    const createdSessionId = await this.createSession(target, this.cwd, "Could not create the default task.");
+    const createdSessionId = await this.createSession(target, "shared", "Could not create the default task.");
     const task = {
       name: "default",
       sessionId: createdSessionId,
@@ -2916,14 +2968,14 @@ var NamedSessionManager = class {
   }
   async loadTask(task, failureMessage) {
     try {
-      return (await this.router.loadManagedSession(task.sessionId, task.target, task.cwd)).loaded;
+      return (await this.router.loadManagedSession(task.sessionId, task.target, this.cwd, task.cwd, task.isolation)).loaded;
     } catch (error) {
       throw new Error(failureMessage, { cause: error });
     }
   }
-  async createSession(target, cwd, failureMessage) {
+  async createSession(target, isolation, failureMessage) {
     try {
-      return await this.router.createManagedSession(target, cwd);
+      return await this.router.createManagedSession(target, this.cwd, isolation);
     } catch (error) {
       throw new Error(failureMessage, { cause: error });
     }
@@ -3046,7 +3098,11 @@ var NamedSessionManager = class {
     if (!owners.some((candidate) => candidate.channelName === owner.channelName && candidate.chatId === owner.chatId && candidate.senderId === owner.senderId)) {
       owners.push(owner);
     }
-    const next = { version: REGISTRY_VERSION, owners };
+    const next = {
+      version: REGISTRY_VERSION,
+      workspaceCwd: this.canonicalCwd,
+      owners
+    };
     if (!this.isRegistry(next)) {
       throw new Error("Invalid named-session registry update.");
     }
@@ -3057,7 +3113,11 @@ var NamedSessionManager = class {
   }
   readRegistry() {
     if (!existsSync4(this.filePath)) {
-      return { version: REGISTRY_VERSION, owners: [] };
+      return {
+        version: REGISTRY_VERSION,
+        workspaceCwd: this.canonicalCwd,
+        owners: []
+      };
     }
     let value;
     try {
@@ -3068,7 +3128,10 @@ var NamedSessionManager = class {
       });
     }
     if (!this.isRegistry(value)) {
-      if (this.isRegistry(value, false)) {
+      if (this.isRegistry(value, true, true)) {
+        return { ...value, workspaceCwd: this.canonicalCwd };
+      }
+      if (this.isRegistry(value, false) || this.isRegistry(value, false, true)) {
         const stalePath = `${this.filePath}.stale-${randomUUID2()}`;
         try {
           renameSync4(this.filePath, stalePath);
@@ -3078,7 +3141,11 @@ var NamedSessionManager = class {
           });
         }
         process3.stderr.write("[NamedSessionManager] Archived a stale registry after the channel working directory changed.\n");
-        return { version: REGISTRY_VERSION, owners: [] };
+        return {
+          version: REGISTRY_VERSION,
+          workspaceCwd: this.canonicalCwd,
+          owners: []
+        };
       }
       throw new Error(`Invalid named-session registry: ${this.filePath}`);
     }
@@ -3113,10 +3180,14 @@ var NamedSessionManager = class {
       }
     }
   }
-  isRegistry(value, requireCurrentCwd = true) {
+  isRegistry(value, requireCurrentCwd = true, allowMissingWorkspaceCwd = false) {
     if (!this.isRecord(value) || value["version"] !== REGISTRY_VERSION) {
       return false;
     }
+    const workspaceCwd = value["workspaceCwd"];
+    if (workspaceCwd === void 0 ? !allowMissingWorkspaceCwd : typeof workspaceCwd !== "string" || requireCurrentCwd && canonicalizeWorkspacePath(workspaceCwd) !== this.canonicalCwd) {
+      return false;
+    }
     const owners = value["owners"];
     if (!Array.isArray(owners))
       return false;
@@ -3127,6 +3198,9 @@ var NamedSessionManager = class {
         return false;
       }
     }
+    if (workspaceCwd === void 0 && owners.some((owner) => this.isRecord(owner) && Array.isArray(owner["tasks"]) && owner["tasks"].some((task) => this.isRecord(task) && task["isolation"] === "worktree"))) {
+      return false;
+    }
     return true;
   }
   isOwner(value, ownerKeys, sessionIds, requireCurrentCwd) {
@@ -3168,7 +3242,7 @@ var NamedSessionManager = class {
     if (!this.isRecord(value) || !this.isRecord(value["target"]))
       return false;
     const target = value["target"];
-    return typeof value["name"] === "string" && TASK_NAME_PATTERN.test(value["name"]) && typeof value["sessionId"] === "string" && value["sessionId"].length > 0 && typeof value["cwd"] === "string" && (!requireCurrentCwd || this.isCurrentCwd(value["cwd"])) && value["isolation"] === "shared" && (value["status"] === "open" || value["status"] === "closed") && this.isTimestamp(value["createdAt"]) && this.isTimestamp(value["updatedAt"]) && this.isTimestamp(value["lastSelectedAt"]) && target["channelName"] === channelName && target["chatId"] === chatId && target["senderId"] === senderId && (target["threadId"] === void 0 || typeof target["threadId"] === "string") && (target["isGroup"] === void 0 || typeof target["isGroup"] === "boolean");
+    return typeof value["name"] === "string" && TASK_NAME_PATTERN.test(value["name"]) && typeof value["sessionId"] === "string" && value["sessionId"].length > 0 && typeof value["cwd"] === "string" && isAbsolute2(value["cwd"]) && (value["isolation"] === "shared" || value["isolation"] === "worktree") && (!requireCurrentCwd || (value["isolation"] === "shared" ? this.isCurrentCwd(value["cwd"]) : !this.isCurrentCwd(value["cwd"]))) && (value["status"] === "open" || value["status"] === "closed") && this.isTimestamp(value["createdAt"]) && this.isTimestamp(value["updatedAt"]) && this.isTimestamp(value["lastSelectedAt"]) && target["channelName"] === channelName && target["chatId"] === chatId && target["senderId"] === senderId && (target["threadId"] === void 0 || typeof target["threadId"] === "string") && (target["isGroup"] === void 0 || typeof target["isGroup"] === "boolean");
   }
   isCurrentCwd(cwd) {
     return canonicalizeWorkspacePath(cwd) === this.canonicalCwd;
@@ -3488,6 +3562,71 @@ function truncateError(message) {
 }
 __name(truncateError, "truncateError");
 
+// packages/channels/base/dist/message-prefix.js
+init_esbuild_shims();
+function startsWithMessagePrefix(text, prefix) {
+  return text.startsWith(prefix) && (text.length === prefix.length || /\s/u.test(text.charAt(prefix.length)));
+}
+__name(startsWithMessagePrefix, "startsWithMessagePrefix");
+function stripMessagePrefix(text, prefix) {
+  if (!prefix)
+    return text;
+  let candidate = text.trim();
+  while (!startsWithMessagePrefix(candidate, prefix) && (candidate.startsWith("@") || candidate.startsWith("<@"))) {
+    const mention = candidate.match(/^(?:@[^@\s]+|<@[^>]{1,64}>)\s+/u)?.[0];
+    if (!mention)
+      return void 0;
+    candidate = candidate.slice(mention.length);
+  }
+  if (!startsWithMessagePrefix(candidate, prefix))
+    return void 0;
+  const suffix = candidate.slice(prefix.length);
+  if (!/^\s+\S[\s\S]*$/u.test(suffix))
+    return void 0;
+  return suffix.trim();
+}
+__name(stripMessagePrefix, "stripMessagePrefix");
+function locateDisplayText(envelope, displayText) {
+  const offset = envelope.displayTextOffset;
+  if (offset !== void 0 && envelope.text.startsWith(displayText, offset)) {
+    return offset;
+  }
+  if (offset === void 0 && envelope.text.endsWith(displayText)) {
+    return envelope.text.length - displayText.length;
+  }
+  const first = envelope.text.indexOf(displayText);
+  if (first === -1)
+    return -1;
+  return envelope.text.indexOf(displayText, first + 1) === -1 ? first : "ambiguous";
+}
+__name(locateDisplayText, "locateDisplayText");
+function applyMessagePrefix(envelope, prefix) {
+  if (!prefix || envelope.bypassMessagePrefix || envelope.syntheticText) {
+    return true;
+  }
+  const displayText = envelope.displayText;
+  const prefixText = envelope.messagePrefixText;
+  const sourceText = prefixText ?? displayText ?? envelope.text;
+  const stripped = stripMessagePrefix(sourceText, prefix);
+  if (stripped === void 0)
+    return false;
+  if (displayText === void 0) {
+    if (prefixText !== void 0)
+      envelope.messagePrefixText = stripped;
+    envelope.text = stripped;
+    return true;
+  }
+  const at = locateDisplayText(envelope, displayText);
+  if (at === "ambiguous" || at === -1)
+    return false;
+  if (prefixText !== void 0)
+    envelope.messagePrefixText = stripped;
+  envelope.displayText = stripped;
+  envelope.text = envelope.text.slice(0, at) + stripped + envelope.text.slice(at + displayText.length);
+  return true;
+}
+__name(applyMessagePrefix, "applyMessagePrefix");
+
 // packages/channels/base/dist/ChannelWebhookTask.js
 init_esbuild_shims();
 var MAX_WEBHOOK_PROMPT_CHARS = 8500;
@@ -3878,6 +4017,9 @@ var ChannelBase = class {
   observedContacts;
   namedSessions;
   observedContactEnvelopes = /* @__PURE__ */ new WeakSet();
+  messagePrefix;
+  messagePrefixCheckedEnvelopes = /* @__PURE__ */ new WeakSet();
+  messagePrefixRejectedEnvelopes = /* @__PURE__ */ new WeakSet();
   instructedSessions = /* @__PURE__ */ new Set();
   unattendedMemorySessions = /* @__PURE__ */ new Set();
   channelMemoryReads = /* @__PURE__ */ new Map();
@@ -3998,7 +4140,7 @@ var ChannelBase = class {
   async handleBtw(envelope, sessionId, question, sourceLabel) {
     const target = this.router.getTarget(sessionId);
     if (!target || target.channelName !== this.name) {
-      await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Could not resolve the current task for /btw.", sourceLabel);
+      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Could not resolve the current task for ${this.prefixedCommand("/btw")}.`, sourceLabel);
       return;
     }
     const running = this.activeBtw.get(sessionId);
@@ -4350,8 +4492,12 @@ No answer is available from the current conversation context.`;
     this.removePendingPermission(event.requestId, this.userInputSettlementReason(pending, event.outcome));
   }
   constructor(name, config, bridge, options) {
+    if (config.messagePrefix !== void 0 && typeof config.messagePrefix !== "string") {
+      throw new Error(`Channel "${name}" field "messagePrefix" must be a string.`);
+    }
     this.name = name;
     this.config = config;
+    this.messagePrefix = config.messagePrefix?.trim() || void 0;
     this.bridge = bridge;
     this.proxy = options?.proxy;
     this.stateDir = options?.stateDir;
@@ -4393,6 +4539,9 @@ No answer is available from the current conversation context.`;
       this.attachBridgeEvents(bridge);
     }
   }
+  waitForDisconnect() {
+    return Promise.resolve();
+  }
   /**
    * Thread-targeted delivery. Polling adapters override this to post comments
    * on a specific issue/PR. The default falls through to sendMessage(chatId,
@@ -5609,11 +5758,11 @@ ${promptText}` : promptText;
     const requestSuffix = pending.taskName ? ` ${pending.requestId}` : "";
     const replyPadding = pending.taskName ? { approve: "          ", always: "   ", deny: "             " } : { approve: "        ", always: " ", deny: "           " };
     const replies = [
-      `/approve${requestSuffix}${replyPadding.approve}${approveLabel}`,
+      `${this.prefixedCommand(`/approve${requestSuffix}`)}${replyPadding.approve}${approveLabel}`,
       ...alwaysOption ? [
-        `/approve-always${requestSuffix}${replyPadding.always}${alwaysOption.label}`
+        `${this.prefixedCommand(`/approve-always${requestSuffix}`)}${replyPadding.always}${alwaysOption.label}`
       ] : [],
-      `/deny${requestSuffix}${replyPadding.deny}${denyLabel}`
+      `${this.prefixedCommand(`/deny${requestSuffix}`)}${replyPadding.deny}${denyLabel}`
     ];
     return [
       "Permission required to run a tool",
@@ -5627,6 +5776,12 @@ ${promptText}` : promptText;
       ...replies
     ].join("\n");
   }
+  prefixedCommand(command) {
+    return this.messagePrefix ? `${this.messagePrefix} ${command}` : command;
+  }
+  configuredMessagePrefix() {
+    return this.messagePrefix;
+  }
   permissionTitle(toolCall) {
     const rawTitle = typeof toolCall.title === "string" ? toolCall.title : void 0;
     return sanitizeQuotedText(rawTitle || "", 160).trim() || "Tool use";
@@ -5735,7 +5890,7 @@ ${promptText}` : promptText;
         const task = pending2?.taskName ? `Task ${pending2.taskName} \u2014 ` : "";
         return `- ${task}${sanitizeQuotedText(id, 128)}${title}`;
       }).join("\n");
-      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Multiple permission requests are pending for this chat. Reply with /${decision} <request-id>.
+      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Multiple permission requests are pending for this chat. Reply with ${this.prefixedCommand(`/${decision} <request-id>`)}.
 ${requestList}`);
       return true;
     }
@@ -5749,7 +5904,7 @@ ${requestList}`);
       return true;
     }
     if (pending.userInputPresented && decision !== "deny") {
-      await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Submit this question through its interactive card, or use /deny [request-id] to cancel it.", pending.sourceLabel);
+      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Submit this question through its interactive card, or use ${this.prefixedCommand("/deny [request-id]")} to cancel it.`, pending.sourceLabel);
       return true;
     }
     const response = (() => {
@@ -5876,6 +6031,10 @@ ${requestList}`);
     }
   }
   async sendNamedSessionError(envelope, error) {
+    if (error instanceof Error && error.cause !== void 0) {
+      process.stderr.write(`[${sanitizeLogText(this.name, 64)}] named-session operation failed: ${this.lifecycleError(error)} | cause: ${this.lifecycleError(error.cause)}
+`);
+    }
     const message = error instanceof Error ? sanitizeDisplayText(error.message, 500) : "Named-session operation failed.";
     await this.sendThreadMessage(envelope.chatId, envelope.threadId, message || "Named-session operation failed.");
   }
@@ -5885,7 +6044,7 @@ ${requestList}`);
       return false;
     const normalized = args.trim().toLowerCase();
     if (normalized !== "" && normalized !== "all") {
-      await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Usage: /sessions [all]");
+      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Usage: ${this.prefixedCommand("/sessions [all]")}`);
       return true;
     }
     try {
@@ -5916,18 +6075,16 @@ ${requestList}`);
           if (parts.length > 0)
             break;
           const current = await namedSessions.current(owner);
-          await this.sendThreadMessage(envelope.chatId, envelope.threadId, current ? `Current task: ${current.name} (${current.isolation})` : "No task is currently selected. Use /session new <name> or /session use <name>.");
+          await this.sendThreadMessage(envelope.chatId, envelope.threadId, current ? `Current task: ${current.name} (${current.isolation})` : `No task is currently selected. Use ${this.prefixedCommand("/session new <name>")} or ${this.prefixedCommand("/session use <name>")}.`);
           return true;
         }
         case "new": {
-          if (parts.includes("--worktree")) {
-            await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Worktree tasks are planned for Part 4. Create a shared task with /session new <name>.");
-            return true;
-          }
-          if (parts.length !== 1)
+          const isolation = parts.length === 2 && parts[1] === "--worktree" ? "worktree" : "shared";
+          if (isolation === "shared" && parts.length !== 1 || isolation === "worktree" && parts.length !== 2) {
             break;
-          const created = await namedSessions.create(owner, parts[0]);
-          await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Created and selected task "${created.name}" (shared workspace).`);
+          }
+          const created = await namedSessions.create(owner, parts[0], isolation);
+          await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Created and selected task "${created.name}" (${created.isolation} workspace).`);
           return true;
         }
         case "use": {
@@ -5975,7 +6132,7 @@ ${requestList}`);
       await this.sendNamedSessionError(envelope, error);
       return true;
     }
-    await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Usage: /session current | /session new <name> | /session use <name> | /session close <name> | /session cancel [<name>]");
+    await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Usage: ${this.prefixedCommand("/session current")} | ${this.prefixedCommand("/session new <name> [--worktree]")} | ${this.prefixedCommand("/session use <name>")} | ${this.prefixedCommand("/session close <name>")} | ${this.prefixedCommand("/session cancel [<name>]")}`);
     return true;
   }
   /** Register shared slash commands. Called from constructor. */
@@ -6052,7 +6209,7 @@ ${requestList}`);
         return true;
       }
       if (this.isSharedSession(envelope) && args.toLowerCase() !== "confirm") {
-        await this.sendThreadMessage(envelope.chatId, envelope.threadId, 'This clears the shared session for everyone who shares it. Re-send with "confirm" (e.g. /clear confirm) to proceed.');
+        await this.sendThreadMessage(envelope.chatId, envelope.threadId, `This clears the shared session for everyone who shares it. Re-send with "confirm" (e.g. ${this.prefixedCommand("/clear confirm")}) to proceed.`);
         return true;
       }
       await doClear(envelope);
@@ -6093,19 +6250,19 @@ ${requestList}`);
     this.registerCommand("help", async (envelope) => {
       const lines = [
         "Commands:",
-        "/help \u2014 Show this help",
-        this.isSharedSession(envelope) ? "/clear confirm \u2014 Clear the shared session (aliases: /reset, /new)" : "/clear \u2014 Clear your session (aliases: /reset, /new)",
-        "/who \u2014 Show current session & workspace",
-        "/status \u2014 Show session info",
-        "/approve [request-id] \u2014 Approve a pending permission request",
-        "/approve-always [request-id] \u2014 Always approve a pending permission request",
-        "/deny [request-id] \u2014 Deny a pending permission request",
+        `${this.prefixedCommand("/help")} \u2014 Show this help`,
+        this.isSharedSession(envelope) ? `${this.prefixedCommand("/clear confirm")} \u2014 Clear the shared session (aliases: ${this.prefixedCommand("/reset")}, ${this.prefixedCommand("/new")})` : `${this.prefixedCommand("/clear")} \u2014 Clear your session (aliases: ${this.prefixedCommand("/reset")}, ${this.prefixedCommand("/new")})`,
+        `${this.prefixedCommand("/who")} \u2014 Show current session & workspace`,
+        `${this.prefixedCommand("/status")} \u2014 Show session info`,
+        `${this.prefixedCommand("/approve [request-id]")} \u2014 Approve a pending permission request`,
+        `${this.prefixedCommand("/approve-always [request-id]")} \u2014 Always approve a pending permission request`,
+        `${this.prefixedCommand("/deny [request-id]")} \u2014 Deny a pending permission request`,
         ...this.bridge.btw ? [
-          "/btw <question> \u2014 Ask a side question without interrupting the current task"
+          `${this.prefixedCommand("/btw <question>")} \u2014 Ask a side question without interrupting the current task`
         ] : [],
         ...this.namedSessions ? [
-          "/sessions [all] \u2014 List your named tasks",
-          "/session current|new|use|close|cancel \u2014 Manage your named tasks"
+          `${this.prefixedCommand("/sessions [all]")} \u2014 List your named tasks`,
+          `${this.prefixedCommand("/session current|new|use|close|cancel")} \u2014 Manage your named tasks`
         ] : []
       ];
       const sharedCmds = /* @__PURE__ */ new Set([
@@ -6128,7 +6285,7 @@ ${requestList}`);
       const platformCmds = [...this.commands.keys()].filter((c) => !sharedCmds.has(c));
       if (platformCmds.length > 0) {
         for (const cmd of platformCmds) {
-          lines.push(`/${cmd}`);
+          lines.push(this.prefixedCommand(`/${cmd}`));
         }
       }
       const sessionId = await this.currentSessionId(envelope);
@@ -6139,10 +6296,10 @@ ${requestList}`);
       if (agentCommands.length > 0) {
         lines.push("", "Agent commands (forwarded to Qwen Code):");
         for (const cmd of agentCommands) {
-          lines.push(`/${cmd.name} \u2014 ${cmd.description}`);
+          lines.push(`${this.prefixedCommand(`/${cmd.name}`)} \u2014 ${cmd.description}`);
         }
       }
-      lines.push("", "Send any text to chat with the agent.");
+      lines.push("", this.messagePrefix ? `Start each message with ${this.messagePrefix} to chat with the agent.` : "Send any text to chat with the agent.");
       await this.sendThreadMessage(envelope.chatId, envelope.threadId, lines.join("\n"));
       return true;
     });
@@ -6187,7 +6344,7 @@ ${requestList}`);
       case "cancel":
         return this.handleLoopCancel(envelope, rest[0]);
       default:
-        await this.sendThreadMessage(envelope.chatId, envelope.threadId, 'Usage: /loop add "<cron>" <prompt> | /loop list | /loop inspect <id> | /loop cancel <id>');
+        await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Usage: ${this.prefixedCommand('/loop add "<cron>" <prompt>')} | ${this.prefixedCommand("/loop list")} | ${this.prefixedCommand("/loop inspect <id>")} | ${this.prefixedCommand("/loop cancel <id>")}`);
         return true;
     }
   }
@@ -6204,7 +6361,7 @@ ${requestList}`);
     }
     const parsed = parseLoopAddArgs(args);
     if (!parsed) {
-      await this.sendThreadMessage(envelope.chatId, envelope.threadId, 'Usage: /loop add "<cron>" <prompt>');
+      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Usage: ${this.prefixedCommand('/loop add "<cron>" <prompt>')}`);
       return true;
     }
     try {
@@ -6358,7 +6515,7 @@ ${requestList}`);
     if (!this.loopController)
       return true;
     if (!id) {
-      await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Usage: /loop inspect <id>");
+      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Usage: ${this.prefixedCommand("/loop inspect <id>")}`);
       return true;
     }
     const jobs = await this.loopController.listForTarget(this.name, this.loopTargetFromEnvelope(envelope));
@@ -6418,7 +6575,7 @@ ${requestList}`);
     if (!this.loopController)
       return true;
     if (!id) {
-      await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Usage: /loop cancel <id>");
+      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Usage: ${this.prefixedCommand("/loop cancel <id>")}`);
       return true;
     }
     const jobs = await this.loopController.listForTarget(this.name, this.loopTargetFromEnvelope(envelope));
@@ -6542,6 +6699,7 @@ ${requestList}`);
     if ((this.sessionGenerations.get(sessionId) ?? 0) === generation) {
       return false;
     }
+    this.forgetPendingGroupHistory(envelope);
     const loggedText = sanitizeLogText(envelope.text, 80);
     process.stderr.write(`[${this.name}] dropped queued turn from ${envelope.senderId} for session ${sessionId}: session was cleared before it ran (text: ${loggedText})
 `);
@@ -7144,6 +7302,8 @@ ${sanitizePromptText(entry.text).trim()}` : `No channel memory entry ${intent.id
     if (limit <= 0 || envelope.text.trim().length === 0) {
       return;
     }
+    if (envelope.syntheticText)
+      return;
     const senderId = truncateGroupHistoryField(envelope.senderId);
     if (this.config.groupPolicy !== "pairing" && !this.gate.isAllowed(senderId)) {
       return;
@@ -7172,13 +7332,23 @@ ${sanitizePromptText(entry.text).trim()}` : `No channel memory entry ${intent.id
       if (this.config.groupPolicy === "pairing" && !this.groupGate.isGroupApproved(envelope.chatId)) {
         return [];
       }
-      return entries;
+      return envelope.messageId === void 0 ? entries : entries.filter((entry) => entry.messageId !== envelope.messageId);
     } catch (err) {
       process.stderr.write(`[${this.name}] failed to drain group history for chat ${sanitizeLogText(envelope.chatId, 64)}: ${err instanceof Error ? err.message : err}
 `);
       return [];
     }
   }
+  forgetPendingGroupHistory(envelope) {
+    if (envelope.messageId === void 0)
+      return;
+    try {
+      this.groupHistory.forget(this.groupHistoryKey(envelope), truncateGroupHistoryField(envelope.messageId));
+    } catch (err) {
+      process.stderr.write(`[${this.name}] failed to forget group history for chat ${sanitizeLogText(envelope.chatId, 64)}: ${err instanceof Error ? err.message : err}
+`);
+    }
+  }
   clearPendingGroupHistory(envelope) {
     if (!envelope.isGroup && this.config.sessionScope !== "single") {
       return;
@@ -7214,6 +7384,18 @@ ${CURRENT_MESSAGE_MARKER}
 ${promptText}`;
   }
   preflightInbound(envelope, options = {}) {
+    if (this.messagePrefixRejectedEnvelopes.has(envelope))
+      return false;
+    if (!this.messagePrefixCheckedEnvelopes.has(envelope)) {
+      this.messagePrefixCheckedEnvelopes.add(envelope);
+      if (!applyMessagePrefix(envelope, this.messagePrefix)) {
+        this.messagePrefixRejectedEnvelopes.add(envelope);
+        if (!(envelope.isGroup && !envelope.isMentioned && !envelope.isReplyToBot)) {
+          this.logPreflightRejected("message_prefix_mismatch");
+        }
+        return false;
+      }
+    }
     const groupResult = this.groupGate.check(envelope, {
       createPairingRequest: !options.deferPairingRequests
     });
@@ -7269,6 +7451,9 @@ ${promptText}`;
     process.stderr.write(`[Channel:${this.name}] preflight rejected reason=${sanitizeLogText(reason, 80)}
 `);
   }
+  wasMessagePrefixRejected(envelope) {
+    return this.messagePrefixRejectedEnvelopes.has(envelope);
+  }
   logDebugPayload(platform, payload) {
     if (!isDebugPayloadEnabled(this.name))
       return;
@@ -7476,6 +7661,7 @@ ${text}`;
         suppressSaveConfirmation: memorySaveIsSideEffect
       });
       if (!memorySaveIsSideEffect) {
+        this.forgetPendingGroupHistory(envelope);
         return;
       }
     }
@@ -7484,17 +7670,19 @@ ${text}`;
       const handler = this.commands.get(parsed.command);
       if (handler) {
         const handled = await handler(envelope, parsed.args);
-        if (handled)
+        if (handled) {
+          this.forgetPendingGroupHistory(envelope);
           return;
+        }
       }
       if (parsed.command === "btw" && this.bridge.btw) {
         if (!this.isAuthorizedForSharedSession(envelope)) {
-          await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Only authorized members can use /btw in this shared session.");
+          await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Only authorized members can use ${this.prefixedCommand("/btw")} in this shared session.`);
           return;
         }
         btwQuestion = parsed.args.trim();
         if (!btwQuestion) {
-          await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Usage: /btw <question>");
+          await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Usage: ${this.prefixedCommand("/btw <question>")}`);
           return;
         }
         if (btwQuestion.length > CHANNEL_BTW_MAX_INPUT_LENGTH) {
@@ -7502,7 +7690,7 @@ ${text}`;
           return;
         }
         if (envelope.imageBase64 || envelope.attachments?.length) {
-          await this.sendThreadMessage(envelope.chatId, envelope.threadId, "/btw supports text-only questions.");
+          await this.sendThreadMessage(envelope.chatId, envelope.threadId, `${this.prefixedCommand("/btw")} supports text-only questions.`);
           return;
         }
       }
@@ -7558,7 +7746,7 @@ ${text}`;
         return;
       }
       if (!sessionId) {
-        await this.sendThreadMessage(envelope.chatId, envelope.threadId, "No task is currently selected. Use /session new <name> or /session use <name>.");
+        await this.sendThreadMessage(envelope.chatId, envelope.threadId, `No task is currently selected. Use ${this.prefixedCommand("/session new <name>")} or ${this.prefixedCommand("/session use <name>")}.`);
         return;
       }
     } else {
@@ -7566,7 +7754,7 @@ ${text}`;
     }
     const sourceLabel = this.namedSessions ? this.sourceLabelForTurn(sessionId, envelope) : void 0;
     if (this.namedSessions && !sourceLabel) {
-      await this.sendThreadMessage(envelope.chatId, envelope.threadId, "Could not identify the selected task. Use /sessions, select it again, and retry.");
+      await this.sendThreadMessage(envelope.chatId, envelope.threadId, `Could not identify the selected task. Use ${this.prefixedCommand("/sessions")}, select it again, and retry.`);
       return;
     }
     if (btwQuestion !== void 0) {
@@ -7768,6 +7956,9 @@ ${promptText}`;
         return;
       }
       const acceptedRecallContext = recallRead?.generation === recallRead?.state.generation ? recallContext : void 0;
+      if (recognizedSlashCommand) {
+        this.forgetPendingGroupHistory(envelope);
+      }
       const groupHistoryEntries = recognizedSlashCommand ? [] : this.drainPendingGroupHistory(envelope);
       let promptToSend = this.prependGroupHistoryContext(promptText, groupHistoryEntries);
       const hiddenContext = [
@@ -8289,7 +8480,9 @@ var DaemonChannelBridge = class extends EventEmitter2 {
       result.push({
         sessionId: session.sessionId,
         workspaceCwd: session.workspaceCwd,
-        hasActivePrompt: this.activePrompts.has(session.sessionId)
+        hasActivePrompt: this.activePrompts.has(session.sessionId),
+        ...session.worktree ? { worktree: { ...session.worktree } } : {},
+        ...session.worktreeState ? { worktreeState: session.worktreeState } : {}
       });
     }
     return result;
@@ -8298,13 +8491,17 @@ var DaemonChannelBridge = class extends EventEmitter2 {
     this.connected = true;
   }
   async newSession(cwd, options, bindingToken) {
+    if (options?.worktree && !this.options.sessionWorktreePersistence) {
+      throw new Error("The daemon does not support durable Channel worktree sessions.");
+    }
     const lifecycleGeneration = this.lifecycleGeneration;
     const session = await this.options.sessionFactory({
       workspaceCwd: cwd || this.options.cwd,
       modelServiceId: this.options.modelServiceId,
       sessionScope: this.options.sessionScope ?? "thread",
       ...options?.approvalMode ? { approvalMode: options.approvalMode } : {},
-      ...options?.sourceId ? { sourceId: options.sourceId } : {}
+      ...options?.sourceId ? { sourceId: options.sourceId } : {},
+      ...options?.worktree ? { worktree: options.worktree } : {}
     });
     if (lifecycleGeneration !== this.lifecycleGeneration) {
       await this.rejectStaleSession(session);
@@ -8751,7 +8948,7 @@ var DaemonChannelBridge = class extends EventEmitter2 {
         const toolCallId = getString(update["toolCallId"]);
         const kind = getString(update["kind"]);
         const meta = isRecord3(update["_meta"]) ? update["_meta"] : void 0;
-        if (!kind && toolCallId && getString(update["status"]) === "in_progress" && meta?.["shellProgress"] !== void 0) {
+        if (!kind && toolCallId && getString(update["status"]) === "in_progress" && (meta?.["shellProgress"] !== void 0 || meta?.["subagentProgress"] === true)) {
           break;
         }
         if (!toolCallId || !kind) {
@@ -9187,6 +9384,8 @@ export {
   sanitizeLogText,
   SessionRouter,
   ChannelLoopScheduler,
+  startsWithMessagePrefix,
+  stripMessagePrefix,
   ChannelBase,
   PollingChannelBase,
   CHANNEL_PROMPT_META_KEY,