@zq-silk/yui 0.6.4 → 0.6.6

package/dist/storage/taskStore.js

@@ -10,8 +10,10 @@ import { resolveTimeZone } from "../output/timePresentation.js";
 import { mailboxTargetKey, validateWorkMailbox } from "../coordination/workMailbox.js";
 import { validateInputRequest } from "../input/inputRequest.js";
 import { validateRoleSessionSet } from "../executor/agentExecutor.js";
+import { validatePendingTurnCompletion } from "../executor/turnCompletion.js";
 import { validateTaskMessage } from "../message/message.js";
 import { validateAgentRun } from "../run/agentRun.js";
+import { compareRuntimeSessionCandidates, projectRuntimeSessionCandidate } from "../runtime/runtimeSessionCandidate.js";
 import { FileSessionOwnerRegistry } from "../runtime/sessionOwnerRegistry.js";
 import { validateReviewConfig } from "../review/reviewConfig.js";
 import { validateReviewRound } from "../review/reviewRound.js";
@@ -387,6 +389,13 @@ export class FileTaskStore {
             .map((aggregate) => clone(aggregate.task))
             .sort((left, right) => numericCompare(left.id, right.id));
     }
+    listActiveTaskIds() {
+        // The file rollback backend has no catalog index, so it filters the loaded
+        // aggregate. Layout-7 Controller hot paths use SQLite's bounded selector.
+        return this.listTasks()
+            .filter((task) => task.status === "active")
+            .map((task) => task.id);
+    }
     getStateRevision() { return this.#state().revision; }
     getTask(id) { return optional(this.#state().tasks[id]?.task); }
     readNextActionFacts(taskId) {
@@ -592,12 +601,21 @@ export class FileTaskStore {
             .find((job) => job.idempotencyKey === key);
         return optional(found);
     }
-    listAllDurableJobs() {
+    listActiveDurableJobs() {
+        // The file rollback backend has no secondary indexes, so it filters its
+        // already-loaded aggregate here. Layout-7 Controller hot paths use the
+        // SQLite implementation below, whose status index avoids this history
+        // scan; the return contract and ordering stay identical across backends.
         const all = [];
         for (const aggregate of Object.values(this.#state().tasks)) {
-            all.push(...Object.values(aggregate.durableJobs));
+            for (const job of Object.values(aggregate.durableJobs)) {
+                if (job.status === "queued" || job.status === "running")
+                    all.push(job);
+            }
         }
-        return all.map((job) => clone(job));
+        return all
+            .map((job) => clone(job))
+            .sort((left, right) => numericCompare(`${left.taskId}/${left.id}`, `${right.taskId}/${right.id}`));
     }
     hasActiveDurableJobs() {
         for (const aggregate of Object.values(this.#state().tasks)) {
@@ -732,6 +750,56 @@ export class FileTaskStore {
     listRoleSessionSets(taskId) {
         return values(this.#requireTask(taskId).roleSessionSets, (set) => set.owner.roleName);
     }
+    listRuntimeSessionCandidates(query = {}) {
+        const state = this.#state();
+        const selectedTaskIds = query.taskIds === undefined
+            ? undefined
+            : [...new Set(query.taskIds)].sort(numericCompare);
+        const taskAggregates = query.scope === "global"
+            ? []
+            : selectedTaskIds === undefined
+                ? Object.values(state.tasks)
+                : selectedTaskIds.flatMap((taskId) => {
+                    const aggregate = state.tasks[taskId];
+                    return aggregate === undefined ? [] : [aggregate];
+                });
+        const candidates = [
+            ...taskAggregates.flatMap((task) => (Object.values(task.roleSessionSets).flatMap((sessions) => {
+                const candidate = projectRuntimeSessionCandidate(sessions);
+                return candidate === null ? [] : [candidate];
+            }))),
+            ...(query.scope === "task" || selectedTaskIds !== undefined
+                ? []
+                : Object.values(state.globalRoleSessionSets).flatMap((sessions) => {
+                    const candidate = projectRuntimeSessionCandidate(sessions);
+                    return candidate === null ? [] : [candidate];
+                }))
+        ];
+        return candidates
+            .filter((candidate) => !query.cleanupRequiredOnly || candidate.cleanupRequired)
+            .sort(compareRuntimeSessionCandidates);
+    }
+    listPendingRuntimeTurnCompletions(taskIds) {
+        const selectedTaskIds = taskIds === undefined
+            ? undefined
+            : [...new Set(taskIds)].sort(numericCompare);
+        if (selectedTaskIds?.length === 0)
+            return [];
+        const taskAggregates = selectedTaskIds === undefined
+            ? Object.values(this.#state().tasks)
+            : selectedTaskIds.flatMap((taskId) => {
+                const aggregate = this.#state().tasks[taskId];
+                return aggregate === undefined ? [] : [aggregate];
+            });
+        return taskAggregates.flatMap((aggregate) => (Object.values(aggregate.roleSessionSets).flatMap((sessions) => {
+            const pending = sessions.pendingTurnCompletion;
+            return pending === null || pending === undefined
+                ? []
+                : [validatePendingTurnCompletion(pending)];
+        }))).sort((left, right) => (numericCompare(left.taskId, right.taskId)
+            || numericCompare(left.roleName, right.roleName)
+            || numericCompare(left.runId, right.runId)));
+    }
     saveRoleSessionSet(sessions) {
         const stored = taskSessions(sessions);
         const taskId = stored.owner.taskId;
@@ -836,11 +904,17 @@ export class FileTaskStore {
     }
     getAgentRun(taskId, id) { return optional(this.#state().tasks[taskId]?.agentRuns[id]); }
     listAgentRuns(taskId) { return values(this.#requireTask(taskId).agentRuns, "id"); }
-    listPendingProviderRetries() {
+    listPendingProviderRetries(taskIds) {
         // The legacy File store can answer the empty case without a scan fallback.
         // If durable retry state exists, the db-only capability must fail closed
         // instead of silently losing the Controller's wake deadline.
-        for (const task of this.listTasks()) {
+        const tasks = taskIds === undefined
+            ? this.listTasks()
+            : [...new Set(taskIds)].sort(numericCompare).flatMap((taskId) => {
+                const task = this.getTask(taskId);
+                return task === null ? [] : [task];
+            });
+        for (const task of tasks) {
             if (task.status !== "active")
                 continue;
             for (const run of this.listAgentRuns(task.id)) {
@@ -1104,6 +1178,21 @@ export class FileTaskStore {
     listInputRequests(taskId) {
         return values(this.#requireTask(taskId).inputRequests, "id");
     }
+    listOpenInputRequests(taskIds) {
+        const state = this.#state();
+        const selected = taskIds === undefined
+            ? Object.values(state.tasks)
+            : [...new Set(taskIds)].sort(numericCompare).flatMap((taskId) => {
+                const aggregate = state.tasks[taskId];
+                return aggregate === undefined ? [] : [aggregate];
+            });
+        return selected
+            .flatMap((aggregate) => Object.values(aggregate.inputRequests))
+            .filter((request) => request.status === "open")
+            .map(clone)
+            .sort((left, right) => (numericCompare(left.taskId, right.taskId)
+            || numericCompare(left.id, right.id)));
+    }
     listAllInputRequests() {
         return Object.values(this.#state().tasks)
             .flatMap((aggregate) => Object.values(aggregate.inputRequests).map(clone))
@@ -1390,6 +1479,15 @@ export class FileTaskStore {
             .sort(([left], [right]) => left.localeCompare(right))
             .map(([, mailbox]) => clone(mailbox));
     }
+    listReadyWorkMailboxes() {
+        // The file rollback backend has no secondary indexes. It filters the
+        // in-memory aggregate while preserving the indexed SQLite contract's
+        // target-key order; production layout 7 uses the bounded SQLite query.
+        return Object.entries(this.#state().mailboxes)
+            .filter(([, mailbox]) => mailbox.processing !== null || mailbox.pending !== null)
+            .sort(([left], [right]) => left.localeCompare(right))
+            .map(([, mailbox]) => clone(mailbox));
+    }
     saveWorkMailbox(value) {
         let mailbox;
         try {
@@ -1410,7 +1508,7 @@ export class FileTaskStore {
         return pendingWakeupProjection(this.getWorkMailbox({ kind: "role", taskId, roleName: "leader" }));
     }
     listPendingWakeups() {
-        return this.listWorkMailboxes()
+        return this.listReadyWorkMailboxes()
             .flatMap((mailbox) => {
             const wakeup = pendingWakeupProjection(mailbox);
             return wakeup === null ? [] : [wakeup];

package/i18n/README.zh-CN.md

@@ -52,7 +52,8 @@ Leader 和 Operator，再说明全局 Worker 配置会复制到新建的 Task Ro
 支持的思考强度。随后 setup 会确认位于 Yui home 外部的 Project workspace，
 并询问 shell completion。选择器同时提供原生 CLI 默认值和自定义值入口。
 再次运行不会删除已有 Task/Role，也不会改变当前安装的 Project workspace，
-可用于安全地调整配置。
+可用于安全地调整配置。setup 成功返回前会确保当前 Home 的后台 Controller
+已经启动。
 
 模型与思考强度属于 Agent binding 设置，因此 Operator、Leader 和全局
 Worker 即使使用同一个 Agent CLI，也可以采用不同配置。Profile 中的
@@ -477,6 +478,11 @@ yui controller restart
 
 `controller restart` 会用当前安装的 Yui 版本替换 Controller 进程及其调度循环、socket 服务，不会停止或重启已受管的 tmux/Agent 会话。
 
+成功的 `setup`、`upgrade` 和 `update` 都会确保当前 Home 有一个运行中的
+Controller；如果之前没有运行，会在完成后启动。只读命令和
+`upgrade --dry-run` 不会启动 Controller。`update` 只有在新二进制健康检查通过后，
+才会替换或启动 Controller。
+
 恢复 reconciliation 默认每 120 秒执行一次。普通持久状态变化只会将 Task、Role 或 Operator key 放入队列并立即返回；固定 100ms 窗口内到达的 key 会合并触发一次不重叠的定向处理。Operator 呈现使用独立 lane，不会被 Task 的 Git/worktree 操作阻塞；周期 Git/worktree 处理只覆盖仍有持久 Task mailbox 工作的 Task，活动 Role 的存活检查合并为一次 tmux inventory。Codex turn-complete Hook 直接写入存储，不启动或等待 Controller，并给合法的 yield、输入请求或完成动作保留 2 秒竞争窗口；到期后才关闭被 Agent 遗忘的活动 Role Run。持久 WorkMailbox 会冻结当前 processing 批次，期间的新事件合并到下一 pending 批次；失败会释放当前批次供恢复。推荐输入与 pending Turn 共用最近 deadline 选择器，不依赖恢复扫描间隔；显式 `task reconcile` 仍会立即请求恢复扫描。保留的闭环为：
 
 1. 准备 active Project Task 的主 worktree；

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zq-silk/yui",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Local control plane for long-running native agent CLI sessions backed by tmux.",
   "license": "MIT",
   "private": false,