@winspan/claude-forge 8.54.4 → 9.12.0

package/dist/daemon/services/task-segmenter.js

@@ -3,16 +3,95 @@ import { logger } from '../../core/utils/logger.js';
 import { timestampToMs } from '../../core/utils/time.js';
 import { truncateSessionId } from '../../core/utils/session.js';
 import { truncateString } from '../../core/utils/format.js';
+import { isNoisePrompt, classifyPromptKind } from '../../core/utils/noise-prompt.js';
 const NEW_TASK_KEYWORDS = [
     '帮我', '实现', '修复', '添加', '重构', '优化', '创建', '删除',
     '升级', '迁移', '部署', '配置', '设计', '提交', '推送',
     'fix', 'add', 'implement', 'refactor', 'create', 'delete', 'deploy',
 ];
-const CONTINUE_KEYWORDS = [
-    '继续', '然后', '还有', '另外', '这个', '那个', '它',
-    '对', '好的', '可以', '是的', '不是', '不对', '改一下',
+/**
+ * decision c6613590 P0 缺陷 A: continuation/ack tokens — the SINGLE source of
+ * truth for "is this prompt a pure continuation/ack?", consumed by
+ * {@link isContinuationPrompt}, which in turn is used by BOTH the smart-window
+ * resume gate (processPrompt) AND the active-task boundary (shouldStartNewTask).
+ *
+ * This deliberately TIGHT list replaces the retired `CONTINUE_KEYWORDS` table:
+ * the easily-collided substrings ('这个'/'那个'/'它'/'不是'/'不对') are REMOVED
+ * because they fire inside ordinary questions:
+ *   • "现在全链路是不是都顺了?" contains '不是'
+ *   • "这个任务怎么又丢了?"     contains '这个'
+ * Those are NEW questions, not continuations, yet the old substring match
+ * resumed a stale task and merged them in. The resume gate now also requires
+ * the prompt to be SHORT and ack-dominated (see isContinuationPrompt) so a
+ * long sentence that merely happens to contain '好的'/'可以' isn't swallowed.
+ */
+const ACK_CONTINUE_KEYWORDS = [
+    '继续', '然后', '还有', '另外',
+    '好的', '可以', '是的', '对', '改一下',
+    'ok', 'go', 'yes', 'continue', '批准', '同意',
 ];
-const TASK_SWITCH_MINUTES = 10;
+/**
+ * decision c6613590 P0 缺陷 A: max trimmed length for a prompt to even be
+ * considered a pure continuation/ack. Real acks ("继续" / "好的，这样可以" /
+ * "对对对" / "好的可以这样做") are all short; the false-positive questions
+ * ("现在全链路是不是都顺了?知识库、skill都正常了吗", "这个任务怎么又丢了?
+ * 老是丢数据不行啊") are well past this. 16 chars comfortably covers the
+ * real acks in the safety-net fixtures while excluding the merge bugs.
+ */
+const ACK_MAX_LEN = 16;
+/**
+ * spec 1713 (2026-05-28) §10.2: hard "reset" markers — an EXPLICIT user signal
+ * that they're starting a different topic, not a heuristic. Kept deliberately
+ * tiny so it never false-fires on normal continuations. These force a new task
+ * synchronously regardless of the time gap.
+ */
+const RESET_KEYWORDS = [
+    '首先', '换个话题', '新问题', '换个',
+    'another question', 'new topic', 'new task',
+];
+/**
+ * spec 1713 §10.2 / §3: synchronous hard-window fallback (minutes). Catches the
+ * obvious "user walked away for >5 min" case as an explicit boundary signal.
+ */
+const HARD_TIME_WINDOW_MIN = 5;
+// Threshold for forcing a new task purely based on inactivity.
+// Raised from 10→30 (2026-05-25) to accommodate long background-agent runs
+// (spawn-and-wait flows of 15-30 min are common). With linkEvent() now also
+// updating lastTime on every tool call, this constant primarily acts as a
+// fallback for sessions where the user genuinely walked away >30 min.
+const TASK_SWITCH_MINUTES = 30;
+// B+ smart window resume: reuse TASK_SWITCH_MINUTES as the look-back window
+// so resume threshold == idle-split threshold (both 30min).
+const TASK_RESUME_WINDOW_MS = TASK_SWITCH_MINUTES * 60 * 1000;
+/**
+ * decision f47c2c90 (二期B, spec 1711): conservative ack-title set for the
+ * parent_task_id linkage. A follow-up task's title matching one of these short
+ * tokens marks it as an approval/continue turn (gate 1 of the triple-gate, in
+ * tandem with the live isContinuationPrompt check on the prompt). Kept as a
+ * lowercase exact-match set because titles are short ack tokens, not free text.
+ * Passed verbatim to storage.getMostRecentUserTaskBefore so the segmenter is the
+ * single source of truth for "what counts as an ack title" (the boot backfill
+ * keeps its own mirror because it has no access to this daemon module).
+ */
+export const PARENT_LINK_ACK_TITLES = [
+    '批准', '同意', 'approve', '好', '好的', '嗯', 'ok', 'okay',
+    '可以', '是', '是的', '继续', 'yes', '对', '行', '没问题',
+];
+/**
+ * Task-tracking overhaul (2026-05-27 spec §3.3 / §R4).
+ *
+ * Bug 3 orphan recovery window. When linkEvent fires without an active
+ * task (e.g. Stop already closed it but sub-agent PostToolUse is still
+ * landing), we attach the event to the most recently completed task on
+ * the session IF it ended within this window. Default 5 min — short
+ * enough to avoid cross-task mis-attribution, long enough to absorb
+ * typical async sub-agent tool flushes (observed 1-4 min in production).
+ *
+ * Exported as `const` (not env-tunable) on purpose: changing it changes
+ * KPI semantics and should be a code review event. R4 mitigation: pure
+ * attachment, end_time is NOT updated by the fallback path (Q3).
+ */
+export const ORPHAN_RECOVERY_WINDOW_MS = 5 * 60_000;
 export class TaskSegmenter {
     storage;
     currentTasks = new Map();
@@ -20,38 +99,224 @@ export class TaskSegmenter {
         this.storage = storage;
     }
     processPrompt(sessionId, prompt, timestamp, eventId) {
+        return this.processPromptWithBoundary(sessionId, prompt, timestamp, eventId).taskId;
+    }
+    /**
+     * decision 265f59d5: same synchronous best-effort segmentation as
+     * {@link processPrompt}, but also reports whether the result was an AMBIGUOUS
+     * merge so the daemon can enqueue an async LLM re-attribution. The hot path is
+     * unchanged — this returns immediately; the LLM call (if any) is the caller's
+     * fire-and-forget responsibility.
+     */
+    processPromptWithBoundary(sessionId, prompt, timestamp, eventId) {
         const key = sessionId;
-        const current = this.currentTasks.get(key) ?? this.recoverActiveTask(key);
+        const current = this.getTrustedCurrent(key);
         const now = timestampToMs(timestamp);
+        // spec b1480935 (2026-06-01 Option A): every prompt creates a task. The
+        // previous noise short-circuit is gone — callback / image / system
+        // envelopes now surface as their own task rows with `task_kind != 'user'`
+        // so Web can show them muted instead of swallowing them. This fixes the
+        // bug where a `<task-notification>` envelope on a session without an
+        // active task would be silently dropped (or worse, "recover" a stale
+        // completed task and turn it into an events black hole).
+        //
+        // Key invariant (OQ #2): NON-user tasks NEVER enter `currentTasks` map
+        // so a real user prompt immediately following a callback always starts
+        // its own task, never gets absorbed by the callback row.
+        const kind = classifyPromptKind(prompt);
+        if (kind !== 'user') {
+            // Callback / image / system envelope. Create its own task row but DO
+            // NOT touch `currentTasks` (so continuation logic ignores it) and DO
+            // NOT close any active user task (the human is still working).
+            const taskId = this.createTask(sessionId, prompt, timestamp, kind);
+            if (eventId)
+                this.storage.linkEventToTask(taskId, eventId);
+            logger.debug(`[TaskSegmenter] Non-user task created kind=${kind} ${truncateString(taskId, 8)} (session=${truncateSessionId(sessionId)})`);
+            return { taskId };
+        }
+        // decision f47c2c90 (二期B, spec 1711 § Phase 2): capture gate 2
+        // (agentJustReturned) BEFORE shouldStartNewTask consumes the one-shot flag.
+        // The triple-gate parent linkage needs to know whether the new task is being
+        // forced *because* a sub-agent just returned.
+        const agentJustReturnedBefore = !!current?.agentJustReturned;
         if (!current || this.shouldStartNewTask(prompt, now, current)) {
             if (current) {
                 this.storage.updateTask(current.id, { status: 'completed', end_time: timestamp });
             }
-            const taskId = this.createTask(sessionId, prompt, timestamp);
+            // B+ smart window resume: when no active task, check for a recently-completed
+            // task within TASK_RESUME_WINDOW_MS (30min). Uses findCompletedTaskForOrphanSmart
+            // (spec §3.A) which also guards against cross-topic mis-attribution via the
+            // "no newer task started in the gap" predicate. Only fires when current==null;
+            // when shouldStartNewTask triggered with an existing current, we've already
+            // moved on intentionally.
+            //
+            // Issue #1 fix (2026-05-29 task-lost): require POSITIVE continuation evidence
+            // (isContinuationPrompt) before resuming. The old gate "absence of NEW_TASK_KEYWORDS"
+            // resumed nearly every keyword-free follow-up prompt ("搞一个新文件存放对比说明",
+            // "前面的属性也加上注释说明"), merging dozens of distinct user intents into one
+            // mega-task spanning hours/days. Real-world impact: session b832930b on
+            // 2026-05-28 had task e559c003 accumulate 91 events / 12 hours / 7 distinct
+            // user prompts before finally being closed — the user saw "task lost" because
+            // each new question failed to surface as a new task card. Now resume only
+            // fires when the user explicitly signals continuation ("继续/然后/对/可以/..."),
+            // which is the actual semantic the smart-window was intended to capture.
+            if (!current && isContinuationPrompt(prompt)) {
+                const eventTsIso = timestamp ?? new Date().toISOString();
+                const candidate = this.storage.findCompletedTaskForOrphanSmart({
+                    session_id: sessionId,
+                    event_ts_iso: eventTsIso,
+                });
+                if (candidate && candidate.end_time) {
+                    const gapMs = Date.parse(eventTsIso) - Date.parse(candidate.end_time);
+                    if (gapMs <= TASK_RESUME_WINDOW_MS) {
+                        this.storage.resumeTask(candidate.id);
+                        this.currentTasks.set(key, { id: candidate.id, lastTime: now });
+                        if (eventId)
+                            this.storage.linkEventToTask(candidate.id, eventId);
+                        logger.info(`[TaskSegmenter] Resumed task ${truncateString(candidate.id, 8)} (gap=${Math.round(gapMs / 60000)} min, session=${truncateSessionId(sessionId)})`);
+                        return { taskId: candidate.id };
+                    }
+                }
+            }
+            // decision f47c2c90 (二期B, spec 1711 § Phase 2): conservative triple-gate
+            // parent linkage. Link this new user task back to the originating user task
+            // ONLY when ALL THREE hold (宁缺毋滥 — see R1):
+            //   1. gate 1: the prompt is an ack/continue (isContinuationPrompt), AND
+            //   2. gate 2: this new task is being forced because a sub-agent just
+            //      returned (agentJustReturnedBefore — "批准后派生实施轮" path), AND
+            //   3. gate 3: there is a same-session user task started within 30min
+            //      strictly before now (storage.getMostRecentUserTaskBefore).
+            // Any gate failing → parentTaskId stays undefined → parent_task_id NULL.
+            // resume path (above) NEVER reaches here (it returns early), per Q3.
+            let parentTaskId;
+            if (agentJustReturnedBefore && isContinuationPrompt(prompt)) {
+                const candidate = this.storage.getMostRecentUserTaskBefore({
+                    session_id: sessionId,
+                    beforeIso: timestamp,
+                    windowMs: TASK_RESUME_WINDOW_MS,
+                    ackTitles: PARENT_LINK_ACK_TITLES,
+                });
+                // Defense-in-depth (R4): parent must exist and never be self.
+                if (candidate)
+                    parentTaskId = candidate;
+            }
+            const taskId = this.createTask(sessionId, prompt, timestamp, 'user', parentTaskId);
             this.currentTasks.set(key, { id: taskId, lastTime: now });
             if (eventId)
                 this.storage.linkEventToTask(taskId, eventId);
-            return taskId;
+            return { taskId };
         }
+        // Continuation: attach to the current task.
         current.lastTime = now;
         if (eventId)
             this.storage.linkEventToTask(current.id, eventId);
-        return current.id;
+        // decision 265f59d5: detect the AMBIGUOUS merge. We merged into the active
+        // task, but if the prompt is neither a clear ack (isContinuationPrompt) nor
+        // carries a NEW_TASK_KEYWORD, the lexical signal was inconclusive — flag it
+        // for the async LLM classifier. Hard signals (5-min / RESET / agent-return)
+        // already routed to the new-task branch above, so reaching here means none
+        // fired. We require a real eventId (nothing to re-attribute otherwise).
+        const ambiguous = eventId !== undefined &&
+            !isContinuationPrompt(prompt) &&
+            !NEW_TASK_KEYWORDS.some(kw => prompt.includes(kw));
+        return {
+            taskId: current.id,
+            ...(ambiguous
+                ? {
+                    ambiguous: {
+                        sessionId,
+                        mergedTaskId: current.id,
+                        eventId,
+                        prompt,
+                        timestamp,
+                    },
+                }
+                : {}),
+        };
     }
-    linkEvent(sessionId, eventId) {
-        const current = this.currentTasks.get(sessionId) ?? this.recoverActiveTask(sessionId);
+    /**
+     * Attach a non-prompt event (PostToolUse / PreToolUse / Stop / spawn …) to the
+     * session's currently-open task and refresh `lastTime`.
+     *
+     * Refreshing `lastTime` here is the critical part of the long-flow fix
+     * (2026-05-25): without it, `shouldStartNewTask` only sees the gap between
+     * user prompts, so a 20-minute background-agent run with hundreds of tool
+     * calls looks identical to the user walking away. The next prompt then trips
+     * `TASK_SWITCH_MINUTES` and the post-spawn work gets re-attributed to a
+     * brand-new task — exactly the symptom seen in task 36471706.
+     *
+     * `timestamp` is optional for backward compatibility; callers that already
+     * know the event timestamp should pass it (we trust hook timestamps more
+     * than wall-clock here because event delivery can be queued/replayed).
+     */
+    linkEvent(sessionId, eventId, timestamp, opts) {
+        const current = this.getTrustedCurrent(sessionId);
         if (current) {
             this.storage.linkEventToTask(current.id, eventId);
+            current.lastTime = timestamp ? timestampToMs(timestamp) : Date.now();
+            // spec 1713 §10.2 sub-agent boundary: a completed Task tool-call means a
+            // sub-agent just returned. Arm the one-shot flag so the NEXT user prompt
+            // starts a fresh task (the post-spawn work and the follow-up question are
+            // almost always distinct intents). Cleared on consume in
+            // shouldStartNewTaskHard.
+            if (opts?.hookType === 'PostToolUse' && opts?.toolName === 'Task') {
+                current.agentJustReturned = true;
+            }
+            return;
+        }
+        // Task-tracking deep fix (spec 1551 §3.A): smart-window orphan recovery.
+        // Primary path: smart algorithm finds the most recently completed task
+        // with no newer task blocking the gap (no fixed 5-min cap).
+        // Fallback: if smart SQL fails or returns null, fall back to the old
+        // ORPHAN_RECOVERY_WINDOW_MS=5min path (Q4 = retain as defensive fallback).
+        //
+        // Q3 (spec §11): do NOT update task.end_time — pure attachment only.
+        // Updating end_time would stretch duration KPI for every orphan.
+        const eventTsIso = timestamp ?? new Date().toISOString();
+        // Primary: smart window (no fixed time cap)
+        let recovered = this.storage.findCompletedTaskForOrphanSmart({
+            session_id: sessionId,
+            event_ts_iso: eventTsIso,
+        });
+        // Fallback: legacy 5-min window (Q4 — retained for SQL error resilience)
+        if (!recovered) {
+            recovered = this.storage.findRecentCompletedTaskForOrphan({
+                session_id: sessionId,
+                event_ts_iso: eventTsIso,
+                sinceMs: ORPHAN_RECOVERY_WINDOW_MS,
+            });
+            if (recovered) {
+                logger.debug(`[TaskSegmenter] Orphan-recovery (5min fallback): attached event to ` +
+                    `${truncateString(recovered.id, 8)} (session=${truncateSessionId(sessionId)})`);
+            }
+        }
+        if (recovered) {
+            this.storage.attachEventToTask(recovered.id, eventId);
+            logger.debug(`[TaskSegmenter] Orphan-recovery (smart-window): attached event to ` +
+                `${truncateString(recovered.id, 8)} (session=${truncateSessionId(sessionId)})`);
         }
     }
     /**
      * 从数据库恢复 session 的 active 任务到内存 Map。
      * 用于 daemon 重启后内存丢失场景的 lazy 恢复。
      * 找不到 active 任务时返回 null（不报错）。
+     *
+     * spec b1480935 (2026-06-01 Option A): only `task_kind='user'` tasks are
+     * eligible — callback / image / system rows MUST NOT be re-installed as
+     * the session's "current task" or every subsequent event would attach
+     * to an envelope row. The legacy `!is_noise` guard is preserved as a
+     * fallback for rows where backfill hasn't yet promoted task_kind.
+     *
+     * Orphan-event robustness fix (2026-06-01): switched from
+     * `queryTasks(limit:5).find(...)` to a DIRECT `getActiveUserTask()` SQL
+     * lookup. The old path took the most-recent 5 rows THEN filtered — on a
+     * high-task-count session a burst of newer agent-callback / completed rows
+     * pushed the active user task out of the top-5, so `.find()` returned null
+     * and every event after it orphaned. The direct query applies the predicate
+     * at the DB layer with no LIMIT truncation.
      */
     recoverActiveTask(sessionId) {
-        const tasks = this.storage.queryTasks({ session_id: sessionId, limit: 5 });
-        const activeTask = tasks.find(t => t.status === 'active');
+        const activeTask = this.storage.getActiveUserTask(sessionId);
         if (!activeTask)
             return null;
         const anchor = activeTask.end_time ?? activeTask.start_time;
@@ -61,6 +326,100 @@ export class TaskSegmenter {
         logger.info(`[TaskSegmenter] Recovered active task ${truncateString(activeTask.id, 8)} for session ${truncateSessionId(sessionId)} from DB`);
         return entry;
     }
+    /**
+     * Orphan-event robustness fix (2026-06-01): proactively re-populate the
+     * in-memory `currentTasks` map from the DB at daemon startup.
+     *
+     * Problem: after a daemon restart `currentTasks` is empty, so every event
+     * relies on per-event lazy `recoverActiveTask`. During the restart window a
+     * burst of buffered + replayed events arrives; any whose recovery heuristic
+     * doesn't fire (e.g. the orphan-recovery smart window finds no completed
+     * task) gets dropped. Hydrating up-front means those events hit the fast
+     * `currentTasks.get()` path instead.
+     *
+     * Idempotent + fault-tolerant: safe to call multiple times (it overwrites
+     * with the same DB-derived state) and never throws — a query failure logs
+     * and leaves the map untouched so the daemon still starts.
+     *
+     * @returns number of sessions hydrated (useful for the startup log line).
+     */
+    hydrateActiveTasks() {
+        try {
+            const rows = this.storage.queryActiveUserTaskSessions();
+            let count = 0;
+            for (const row of rows) {
+                if (!row.session_id || !row.task_id)
+                    continue;
+                this.currentTasks.set(row.session_id, {
+                    id: row.task_id,
+                    lastTime: timestampToMs(row.start_time),
+                });
+                count += 1;
+            }
+            if (count > 0) {
+                logger.info(`[TaskSegmenter] Hydrated ${count} active user task(s) from DB on startup`);
+            }
+            return count;
+        }
+        catch (err) {
+            logger.warn(`[TaskSegmenter] hydrateActiveTasks failed (non-fatal): ${err}`);
+            return 0;
+        }
+    }
+    /**
+     * decision c6613590 P0 缺陷 B: trusted map-hit accessor.
+     *
+     * The in-memory `currentTasks` map can hold a DANGLING pointer to a task the
+     * stale-task GC (daemon/index.ts `completeStaleActiveTasks`) already flipped
+     * to status='completed' in the DB. The old code trusted any map hit blindly,
+     * so a new prompt / late event would `linkEventToTask` onto that completed
+     * row — advancing its end_time and merging independent prompts into a stale
+     * task.
+     *
+     * Two defences run together (spec: "两个都修最稳"):
+     *   1. daemon evicts GC'd ids from the map (see {@link evictTasks}); but a
+     *      daemon that never restarts can still race the 5-min GC tick.
+     *   2. THIS guard PK-rechecks `status='active'` before trusting a map hit.
+     *      If the row is no longer active, we drop the stale entry and fall back
+     *      to `recoverActiveTask` (DB-authoritative). This makes the map a cache,
+     *      never an authority, for the active-task invariant.
+     */
+    getTrustedCurrent(sessionId) {
+        const cached = this.currentTasks.get(sessionId);
+        if (cached) {
+            if (this.storage.isTaskActive(cached.id))
+                return cached;
+            // Dangling pointer to a GC'd / closed task — evict and re-derive from DB.
+            this.currentTasks.delete(sessionId);
+            logger.debug(`[TaskSegmenter] Dropped stale currentTasks entry ${truncateString(cached.id, 8)} ` +
+                `(no longer active in DB, session=${truncateSessionId(sessionId)})`);
+        }
+        return this.recoverActiveTask(sessionId);
+    }
+    /**
+     * decision c6613590 P0 缺陷 B: evict the given task ids from the in-memory
+     * `currentTasks` map. Called by the daemon's stale-task GC after it flips
+     * those tasks to 'completed' in the DB, so the map never keeps a dangling
+     * pointer that drags a closed task's end_time forward.
+     *
+     * Keyed by sessionId (the map's key), but we also verify the mapped task id
+     * matches before deleting — a session whose active task was already replaced
+     * by a newer one must NOT have its live entry evicted just because an older
+     * task on the same session was GC'd.
+     *
+     * @returns number of map entries actually evicted (for the daemon log line).
+     */
+    evictTasks(closed) {
+        let evicted = 0;
+        for (const { id, session_id } of closed) {
+            const entry = this.currentTasks.get(session_id);
+            if (entry && entry.id === id) {
+                this.currentTasks.delete(session_id);
+                evicted += 1;
+            }
+        }
+        return evicted;
+    }
     getCurrentTaskId(sessionId) {
         return this.currentTasks.get(sessionId)?.id ?? null;
     }
@@ -74,21 +433,89 @@ export class TaskSegmenter {
         });
         this.currentTasks.delete(sessionId);
     }
+    /**
+     * Boundary decision for the synchronous path.
+     *
+     * spec 1713 (2026-05-28) introduced the hard-signal boundary
+     * ({@link shouldStartNewTaskHard}); spec b1480935 (2026-06-01) kept the
+     * legacy keyword heuristic for the live daemon. We UNION the two so the
+     * decision is the strictly-more-eager of the pair: a new task starts if
+     * EITHER an explicit hard signal fires (5-min window / RESET_KEYWORDS /
+     * sub-agent return) OR the legacy keyword heuristic asks for it. This keeps
+     * every previously-passing keyword case green while satisfying the spec-1713
+     * hard-signal contract. The async classifier (when wired) corrects any
+     * over- or under-split after the fact.
+     */
     shouldStartNewTask(prompt, now, current) {
+        // Hard signals first — these consume the agentJustReturned flag.
+        if (this.shouldStartNewTaskHard(prompt, now, current))
+            return true;
+        // Legacy keyword heuristic (spec b1480935 live contract).
         const minutesDiff = (now - current.lastTime) / 60000;
         if (minutesDiff > TASK_SWITCH_MINUTES)
             return true;
-        const hasContinue = CONTINUE_KEYWORDS.some(kw => prompt.includes(kw));
-        if (hasContinue)
+        // decision c6613590 P0 缺陷 A (verify follow-up): the continuation gate here
+        // MUST use the SAME tightened predicate as the smart-window resume path
+        // (isContinuationPrompt), not a raw CONTINUE_KEYWORDS substring match. The
+        // old `CONTINUE_KEYWORDS.some(kw => prompt.includes(kw))` fired on '不是'/
+        // '这个'/'它' inside ordinary active-window follow-up questions
+        // ("现在全链路是不是都顺了…", "这个任务怎么又丢了…"), returning false here
+        // and merging those distinct prompts into the still-active task. Single
+        // source of truth: both the resume gate (processPrompt) and this active-task
+        // boundary now defer to isContinuationPrompt (length gate ≤16 +
+        // ACK_CONTINUE_KEYWORDS), so there is no second substring matcher to drift.
+        if (isContinuationPrompt(prompt))
             return false;
         const hasNewTask = NEW_TASK_KEYWORDS.some(kw => prompt.includes(kw));
         return hasNewTask;
     }
-    createTask(sessionId, prompt, timestamp) {
+    /**
+     * spec 1713 §10.2: the hard-signal boundary. Returns true when an OBJECTIVE
+     * marker says "new task":
+     *   1. a sub-agent just returned (agentJustReturned flag) → consumes the flag
+     *   2. gap > HARD_TIME_WINDOW_MIN (5 min)
+     *   3. an explicit RESET_KEYWORD appears in the prompt
+     *
+     * Pure of keyword *heuristics* (NEW_TASK_KEYWORDS) — those live in the legacy
+     * path. Mutates `current.agentJustReturned` (clears it) by design: the flag
+     * is a one-shot that only forces the immediately-following prompt.
+     */
+    shouldStartNewTaskHard(prompt, now, current) {
+        if (current.agentJustReturned) {
+            current.agentJustReturned = false; // one-shot — clear on consume
+            return true;
+        }
+        const minutesDiff = (now - current.lastTime) / 60000;
+        if (minutesDiff > HARD_TIME_WINDOW_MIN)
+            return true;
+        if (RESET_KEYWORDS.some(kw => prompt.includes(kw)))
+            return true;
+        return false;
+    }
+    createTask(sessionId, prompt, timestamp, kind, parentTaskId) {
         const taskId = randomUUID();
         const title = this.extractTitle(prompt);
-        this.storage.writeTask({ id: taskId, session_id: sessionId, title, start_time: timestamp });
-        logger.info(`[TaskSegmenter] New task: "${title}" (${truncateString(taskId, 8)})`);
+        // decision f47c2c90 (二期B): never self-link (R4 defense-in-depth). The
+        // candidate from getMostRecentUserTaskBefore is always strictly earlier than
+        // this fresh uuid, so this is belt-and-suspenders.
+        const safeParent = parentTaskId && parentTaskId !== taskId ? parentTaskId : undefined;
+        // spec b1480935 (2026-06-01): is_noise is now deprecated. We KEEP writing
+        // it during the transition window so any consumer that hasn't switched to
+        // task_kind yet still sees the right value (a callback row is is_noise=1
+        // AND task_kind='agent-callback'). The boolean comes from the same
+        // heuristic for backward compat — envelope/short titles still get is_noise=1.
+        const isNoise = computeIsNoise(title) || kind !== 'user';
+        this.storage.writeTask({
+            id: taskId,
+            session_id: sessionId,
+            title,
+            start_time: timestamp,
+            is_noise: isNoise,
+            task_kind: kind,
+            parent_task_id: safeParent ?? null,
+        });
+        logger.info(`[TaskSegmenter] New task kind=${kind} "${title}" (${truncateString(taskId, 8)})` +
+            (isNoise ? ' [noise]' : ''));
         return taskId;
     }
     extractTitle(prompt) {
@@ -99,4 +526,87 @@ export class TaskSegmenter {
         return truncateString(firstLine, 60);
     }
 }
+/**
+ * Task-tracking overhaul (2026-05-27 spec §3.2).
+ *
+ * Compute the is_noise flag for a freshly-extracted task title. Three
+ * heuristics, all conservative — the goal is to drop obvious envelope /
+ * sub-3-char / slash-command noise WITHOUT eating real user prompts:
+ *
+ *   • length(trim(title)) < 3 — sub-3-char titles ('好的'=2, 'ok'=2,
+ *     single CJK char). Note: spec §3.2 lists '好的' as expected-noise
+ *     and '推送吧'=3 as expected-real; this matches.
+ *   • title matches one of NOISE_PROMPT_PREFIXES (envelope tags emitted
+ *     by the framework on UserPromptSubmit).
+ *   • title is a single-word slash command (`/help`, `/login`, …) — the
+ *     user didn't actually start a new task, they fired a CC slash menu.
+ *
+ * What this DOES NOT flag (intentional — spec §3.2):
+ *   - Semantic acknowledgements like '批准' / 'approve' / 'ok' / '可以'.
+ *     Those titles should never reach createTask once SpecGate.handle
+ *     Approval is wired in Step 6. If they DO arrive in the meantime
+ *     (e.g. test seeds, legacy bug, race), Web shows them so the user
+ *     can spot the regression rather than silently dropping them.
+ *
+ * Exported for unit-test reuse; the production caller is
+ * TaskSegmenter.createTask above.
+ */
+export function computeIsNoise(title) {
+    const trimmed = title.trim();
+    if (trimmed.length === 0)
+        return true;
+    if (trimmed.length < 3)
+        return true;
+    // Envelope detection reuses the canonical isNoisePrompt utility so the
+    // prefix list stays a single source of truth (see core/utils/noise-prompt.ts).
+    if (isNoisePrompt(trimmed))
+        return true;
+    // Single-word slash command (starts with /, contains no whitespace).
+    if (trimmed.startsWith('/') && !/\s/.test(trimmed))
+        return true;
+    return false;
+}
+/**
+ * True if the prompt is actually a tool-generated envelope (task-notification,
+ * system-reminder, image attachment, etc.) rather than a real human prompt.
+ *
+ * Thin wrapper over the canonical {@link isNoisePrompt} (core/utils). Kept
+ * as a named export so existing imports stay stable; each consumer's
+ * "what to do with noise" decision still lives at the call site (spec-gate
+ * skips auto-spec, here we skip task creation).
+ */
+export function isNoisePromptForSegmenter(prompt) {
+    return isNoisePrompt(prompt);
+}
+/**
+ * True if the prompt is a genuine short continuation / acknowledgement
+ * ("继续" / "好的，这样可以" / "对对对" / "ok" / "批准" …) that should resume
+ * a recently-completed task via the B+ smart-window gate.
+ *
+ * decision c6613590 P0 缺陷 A — the old implementation (and the now-retired
+ * `CONTINUE_KEYWORDS` table) was `CONTINUE_KEYWORDS.some(kw => prompt.includes(kw))`,
+ * a pure SUBSTRING match.
+ * Because the keyword list contained '不是' / '这个' / '那个' / '它' / '不对',
+ * ordinary NEW questions were mis-classified as continuations and merged into
+ * a stale task:
+ *   • "现在全链路是不是都顺了?知识库、skill都正常了吗"  → '不是' matched
+ *   • "这个任务怎么又丢了?老是丢数据不行啊"            → '这个' matched
+ *
+ * The fix has two layers, BOTH must hold:
+ *   1. Length gate — the trimmed prompt must be ≤ ACK_MAX_LEN. A genuine ack
+ *      is short; a multi-clause question is not.
+ *   2. Ack-token presence — an ACK_CONTINUE_KEYWORD (collision-prone tokens
+ *      removed) must appear in the (short) prompt.
+ *
+ * This keeps every real ack a continuation ("继续"/"好的，这样可以"/"对对对"/
+ * "好的可以这样做") while the two real-world merge bugs above now return false
+ * and correctly start a new task. Exported for unit-test reuse.
+ */
+export function isContinuationPrompt(prompt) {
+    const trimmed = prompt.trim();
+    if (trimmed.length === 0 || trimmed.length > ACK_MAX_LEN)
+        return false;
+    const lower = trimmed.toLowerCase();
+    return ACK_CONTINUE_KEYWORDS.some(kw => lower.includes(kw.toLowerCase()));
+}
 //# sourceMappingURL=task-segmenter.js.map

package/dist/daemon/services/task-segmenter.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-segmenter.js","sourceRoot":"","sources":["../../../src/daemon/services/task-segmenter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-segmenter.js","sourceRoot":"","sources":["../../../src/daemon/services/task-segmenter.ts"],"names":[],"mappings":"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"}