@sema-agent/server 7.111.0 → 7.113.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/MIGRATION.md +68 -0
- package/USAGE.md +3 -3
- package/dist/approval-ask-audit-store.d.ts +3 -4
- package/dist/approval-ask-audit-store.js +3 -3
- package/dist/approval-card.d.ts +4 -4
- package/dist/boot/coordinators.js +1 -1
- package/dist/boot/stores.js +4 -6
- package/dist/boot/workflow-orchestration.js +4 -4
- package/dist/config-types.d.ts +1 -1
- package/dist/config.js +2 -1
- package/dist/hooks/hook-runner.d.ts +7 -2
- package/dist/hooks/hook-runner.js +48 -4
- package/dist/host-decision.d.ts +5 -3
- package/dist/http/admission.js +12 -3
- package/dist/http/request-guards.js +2 -2
- package/dist/http/resume-legs.d.ts +14 -24
- package/dist/http/resume-legs.js +91 -29
- package/dist/http/route-ctx.d.ts +64 -17
- package/dist/http/route-ctx.js +4 -0
- package/dist/http/routes/approvals-assistant.js +1 -1
- package/dist/http/routes/background.js +2 -2
- package/dist/http/routes/mcp-reconnect.js +2 -2
- package/dist/http/routes/notify-wake.js +3 -3
- package/dist/http/routes/runs.js +22 -19
- package/dist/http/routes/session-sync.js +6 -6
- package/dist/http/routes/sessions.js +20 -20
- package/dist/http/routes/tasks.d.ts +3 -2
- package/dist/http/routes/tasks.js +38 -45
- package/dist/http/send.d.ts +1 -1
- package/dist/http/send.js +1 -1
- package/dist/http/server.js +1 -2
- package/dist/http/wire-types.d.ts +1 -1
- package/dist/local-data-root.d.ts +14 -0
- package/dist/local-data-root.js +5 -0
- package/dist/observability/corrupt-read-seat.d.ts +46 -66
- package/dist/observability/corrupt-read-seat.js +74 -59
- package/dist/observability/fail-open.d.ts +29 -1
- package/dist/observability/fail-open.js +26 -1
- package/dist/observability/run-terminal.js +39 -0
- package/dist/orchestration/workflow-agent-session-index.d.ts +1 -5
- package/dist/orchestration/workflow-agent-session-index.js +2 -2
- package/dist/orchestration/workflow-notify-journal.d.ts +1 -3
- package/dist/orchestration/workflow-notify-journal.js +2 -2
- package/dist/plugins/approval-ask-store-file.d.ts +1 -4
- package/dist/plugins/approval-ask-store-file.js +2 -2
- package/dist/plugins/file-resume-anchor-store.d.ts +1 -6
- package/dist/plugins/file-resume-anchor-store.js +2 -4
- package/dist/plugins/file-run-store.d.ts +0 -4
- package/dist/plugins/file-run-store.js +1 -3
- package/dist/plugins/send-file-ledger.d.ts +1 -5
- package/dist/plugins/send-file-ledger.js +2 -2
- package/dist/plugins/store-backend.js +8 -9
- package/dist/plugins/store-contracts.d.ts +40 -7
- package/dist/plugins/store-contracts.js +1 -0
- package/dist/plugins/user-input-ledger-file.d.ts +1 -5
- package/dist/plugins/user-input-ledger-file.js +2 -2
- package/dist/run-cancel-context.d.ts +59 -7
- package/dist/run-cancel-context.js +26 -0
- package/dist/run-local.d.ts +1 -1
- package/dist/run-local.js +2 -2
- package/dist/runs.d.ts +7 -5
- package/dist/runs.js +18 -13
- package/dist/spec-fields.js +0 -1
- package/dist/tool-approval.d.ts +1 -1
- package/dist/trace/core-keyset-guard.d.ts +1 -1
- package/dist/trace/project.js +2 -3
- package/dist/trace/redact.d.ts +18 -0
- package/dist/trace/redact.js +4 -0
- package/dist/trace/self-minted-wire.d.ts +22 -0
- package/dist/trace/self-minted-wire.js +8 -0
- package/dist/unattended-permission-mode.d.ts +9 -2
- package/dist/unattended-permission-mode.js +5 -1
- package/dist/user-input-ledger.d.ts +24 -5
- package/dist/user-input-ledger.js +46 -11
- package/package.json +4 -3
- package/scripts/retired-mode-seed-drain-local.mjs +317 -0
package/dist/trace/project.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { admitProviderEcho, redactErrorMessage, redactModelText } from "../observability/run-terminal.js";
|
|
2
|
-
import { isAskClass, isAskOrigin, isModeReleaseReason, isPermissionMode, isPersistedRuleMandate, MCP_DELIVERY_VERDICTS, MCP_LIVENESS_STATES, screenGateOutcome, TEAM_ROLES, ToolRoster, ToolRosterDelta, WRITE_PROTECTION_TARGET_VIEWS } from "@sema-agent/core";
|
|
2
|
+
import { isAskClass, isAskOrigin, isModeReleaseReason, isPermissionMode, isPersistedRuleMandate, isSettlementParty, MCP_DELIVERY_VERDICTS, MCP_LIVENESS_STATES, screenGateOutcome, TEAM_ROLES, ToolRoster, ToolRosterDelta, WRITE_PROTECTION_TARGET_VIEWS } from "@sema-agent/core";
|
|
3
3
|
import { Value } from "typebox/value";
|
|
4
4
|
import { recordFailOpen } from "../observability/fail-open.js";
|
|
5
5
|
import { redactSecrets, redactDeep } from "./redact.js";
|
|
@@ -221,11 +221,10 @@ export function screenedStoredEventData(type, data) {
|
|
|
221
221
|
}
|
|
222
222
|
return { ...d, gate };
|
|
223
223
|
}
|
|
224
|
-
const SETTLEMENT_PARTIES = new Set(["person", "engine", "host", "none"]);
|
|
225
224
|
function projectSettlement(st) {
|
|
226
225
|
const whoV = st.who;
|
|
227
226
|
const partyV = whoV === null || typeof whoV !== "object" ? undefined : whoV.party;
|
|
228
|
-
if (
|
|
227
|
+
if (!isSettlementParty(partyV))
|
|
229
228
|
return undefined;
|
|
230
229
|
const who = whoV;
|
|
231
230
|
return {
|
package/dist/trace/redact.d.ts
CHANGED
|
@@ -133,6 +133,24 @@ export declare function redactSecretsWithArms(text: string, opts?: {
|
|
|
133
133
|
text: string;
|
|
134
134
|
arms: ReadonlySet<RedactionArm>;
|
|
135
135
|
};
|
|
136
|
+
/**
|
|
137
|
+
* 🧪 **跨度出口 —— 只给测试**(车 UH 脱敏基线门 `test/redaction-baseline-gate.test.ts`:判「必隐字节**每一个**都被盖住」,
|
|
138
|
+
* 而不是「必隐串整串不在」—— 后者对截断式脱敏(值的前缀被洗、尾段留着)恒判已藏,gpt-6 腿 r1-F1 [high])。
|
|
139
|
+
*
|
|
140
|
+
* 同一只 {@link runRedaction}、同一遍扫描,原样交出池已经算好的 `kept` 跨度(S-497 那一份;坐标在**归一化视图**上),
|
|
141
|
+
* 不是第二只脱敏器、不改任何判据、不喂观察者(`observe:false`,与影子重扫同口);`opts.json` 与 {@link redactSecrets} 的同名选项
|
|
142
|
+
* 逐字同义(JSON 模式,`redactedPreview` 走的那一条)。生产代码不调用它:
|
|
143
|
+
* 问「有没有凭据形」的消费方走 {@link redactSecretsWithArms}。
|
|
144
|
+
*/
|
|
145
|
+
export declare function redactionSpansForTest(text: string, opts?: {
|
|
146
|
+
json?: boolean;
|
|
147
|
+
}): {
|
|
148
|
+
text: string;
|
|
149
|
+
spans: ReadonlyArray<{
|
|
150
|
+
readonly start: number;
|
|
151
|
+
readonly end: number;
|
|
152
|
+
}>;
|
|
153
|
+
};
|
|
136
154
|
/**
|
|
137
155
|
* 🔴 环 + 深度预算(2026-07-25 补)。原实现是纯递归、**既不记已访问节点也不限深度**,而它的调用位置是
|
|
138
156
|
* **最不可信的边界**:`toolStart`/`toolEnd` 把工具的 `args`/`output`/`structured` 直接喂进来。后果两条:
|
package/dist/trace/redact.js
CHANGED
|
@@ -1791,6 +1791,10 @@ export function redactSecretsWithArms(text, opts) {
|
|
|
1791
1791
|
const r = runRedaction(text, opts?.observe ?? true, opts?.json === true, true, "free-text");
|
|
1792
1792
|
return { text: r.text, arms: new Set(r.hits.map((h) => h.arm)) };
|
|
1793
1793
|
}
|
|
1794
|
+
export function redactionSpansForTest(text, opts) {
|
|
1795
|
+
const r = runRedaction(text, false, opts?.json === true, false, "free-text");
|
|
1796
|
+
return { text: r.text, spans: r.spans.map((sp) => ({ start: sp.start, end: sp.end })) };
|
|
1797
|
+
}
|
|
1794
1798
|
const REDACT_MAX_DEPTH = 64;
|
|
1795
1799
|
export function redactDeep(value) {
|
|
1796
1800
|
return redactDeepInner(value, 0, new WeakSet());
|
|
@@ -58,6 +58,28 @@ export declare const SELF_MINTED_WIRE: {
|
|
|
58
58
|
};
|
|
59
59
|
};
|
|
60
60
|
};
|
|
61
|
+
/**
|
|
62
|
+
* S-947(7.112.0):server 发起的中止在取消终局上留下的机读成因 —— `PersistedTaskResult.abortCause`,与 `cancelContext` 同住、同铸点、
|
|
63
|
+
* 同在场闸(在场 ⇔ 这条终局就是 server 那次中止铸出来的取消终局)。逐词站点见契约 §5.0d。键本身是 run 结果上的 server 侧记键
|
|
64
|
+
* (`store-contracts.ts` 的 `PersistedResultSideKeys`),不是事件投影面的键 ⇒ 不在 `wire-projection-faces.ts`。
|
|
65
|
+
*/
|
|
66
|
+
readonly abortCause: {
|
|
67
|
+
readonly at: "run 结果 result.abortCause(GET /v1/runs/:id → result · done.result · POST /v1/tasks 200 体顶层 · 账本 done 行 result / 无 done 的取消形账本 failed 行顶层)";
|
|
68
|
+
readonly members: {
|
|
69
|
+
client_disconnected: {
|
|
70
|
+
attr: string;
|
|
71
|
+
since: string;
|
|
72
|
+
};
|
|
73
|
+
ask_park_grace_exhausted: {
|
|
74
|
+
attr: string;
|
|
75
|
+
since: string;
|
|
76
|
+
};
|
|
77
|
+
cancel_verb: {
|
|
78
|
+
attr: string;
|
|
79
|
+
since: string;
|
|
80
|
+
};
|
|
81
|
+
};
|
|
82
|
+
};
|
|
61
83
|
/**
|
|
62
84
|
* 会话所有者自助抹除面的**已分类拒** → HTTP 状态(S-930 起与 operator 面 `POST /v1/memory/erase` 同一只映射;`since` 记的是**本面**
|
|
63
85
|
* 自哪一版起这样答 —— 7.107.0 及以前本面只认前两只,其余落 500 `internal.error`)。
|
|
@@ -21,6 +21,14 @@ export const SELF_MINTED_WIRE = {
|
|
|
21
21
|
".claude/AGENTS.md": { attr: "-", since: "7.111.0" },
|
|
22
22
|
},
|
|
23
23
|
},
|
|
24
|
+
abortCause: {
|
|
25
|
+
at: "run 结果 result.abortCause(GET /v1/runs/:id → result · done.result · POST /v1/tasks 200 体顶层 · 账本 done 行 result / 无 done 的取消形账本 failed 行顶层)",
|
|
26
|
+
members: {
|
|
27
|
+
client_disconnected: { attr: "-", since: "7.112.0" },
|
|
28
|
+
ask_park_grace_exhausted: { attr: "-", since: "7.112.0" },
|
|
29
|
+
cancel_verb: { attr: "-", since: "7.112.0" },
|
|
30
|
+
},
|
|
31
|
+
},
|
|
24
32
|
sessionMemoryEraseStatus: {
|
|
25
33
|
at: "POST /v1/sessions/:id/memory/erase(已分类拒 errorCode → HTTP 状态)",
|
|
26
34
|
members: {
|
|
@@ -6,7 +6,9 @@
|
|
|
6
6
|
* 修复腿(集成沙箱修复 `mkRepair`、模块门修复 `leader.ts` `runModuleGate`、单代理修复环 `repair-wire.ts` `attachRepairLoopDeps`)、run-local
|
|
7
7
|
* (`src/run-local.ts`,一次性 CLI)与这些腿的 durable 续跑重挂(`CheckpointCtx.unattendedLeg`)—— 经 {@link withUnattendedLeg} 这**一只**
|
|
8
8
|
* 合并口铸两键:`permissionMode: "default"`(显式:续跑时盖过 checkpoint 记下的旧模式)与 `onAsk` = {@link createUnattendedOnAsk}。
|
|
9
|
-
* 那只 onAsk 读 `AskRequest.classes` **整体**:集非空且每一类都在 {@link UNATTENDED_ANSWERED_CLASSES}(= `{ordinary}`,常量,不是旋钮)⇒ 答 yes
|
|
9
|
+
* 那只 onAsk 读 `AskRequest.classes` **整体**:集非空且每一类都在 {@link UNATTENDED_ANSWERED_CLASSES}(= `{ordinary}`,常量,不是旋钮)⇒ 答 yes
|
|
10
|
+
* —— **以策略的名义**(S-953 / core 7.39.0 #1265:`{allow:true, settledBy:"policy", approver:"unattended_class_answer"}` ⇒ core 结算 `policy_allowed` /
|
|
11
|
+
* `who.party:"policy"`;修前是裸 `true`,core 把机器的放行记成**人**批 `human_allowed` / `person`);
|
|
10
12
|
* 否则不答 —— 本腿**有席**(run-local 的 `createLocalApprover`:有 TTY 问人、无 TTY 当场拒;续跑腿的协调器席)⇒ 交给席;**无席** ⇒ 答
|
|
11
13
|
* `"unavailable"` = 交回 core 的缺席路(本腿武装了 durable park ⇒ park,等人经 `/decide` 答;否则 headless 拒 —— fail-closed)。
|
|
12
14
|
*
|
|
@@ -47,12 +49,17 @@ import type { AskClass, AskRequest, OnAsk, TaskSpec } from "@sema-agent/core";
|
|
|
47
49
|
* 不变量(测试钉):答集 ⊆ core `RELEASABLE_ASK_CLASSES`,且与带 `requiresRealApproval` 的类(core `RRA_EXPLAINERS` ∪ `policy_rra`)不交;`mode` 不在其中。
|
|
48
50
|
*/
|
|
49
51
|
export declare const UNATTENDED_ANSWERED_CLASSES: ReadonlySet<AskClass>;
|
|
52
|
+
/**
|
|
53
|
+
* S-953(core 7.39.0 #1265):按类作答层这只席的**名字** —— 本仓自己的闭词(core 只把它转录到结算记录的 `who.approver`,不认证、不回读;
|
|
54
|
+
* `AskOutcome.approver` 契约逐字「a closed word the host owns, never a person」)。审计读者按它认出「这一次放行是无人值守腿按类答的」。
|
|
55
|
+
*/
|
|
56
|
+
export declare const UNATTENDED_POLICY_APPROVER = "unattended_class_answer";
|
|
50
57
|
/** onAsk 的函数臂(`"allow"` / `"deny"` 两个字面臂是姿态设置,不是席)—— 本腿的活审批席与本层自己都是这一形。 */
|
|
51
58
|
export type UnattendedSeat = Extract<OnAsk, (req: AskRequest, signal?: AbortSignal) => unknown>;
|
|
52
59
|
/** 这一问是不是机器答得了的:读 `classes` **整体** —— 在场、非空、且每一类都在答集;缺席 / 空 / 任一类在答集外 ⇒ 否。 */
|
|
53
60
|
export declare function unattendedAnswers(req: Pick<AskRequest, "classes">): boolean;
|
|
54
61
|
/**
|
|
55
|
-
* 按类作答的 onAsk(活对象 ⇒ `create*`)。答得了 ⇒
|
|
62
|
+
* 按类作答的 onAsk(活对象 ⇒ `create*`)。答得了 ⇒ 策略的 yes(这一次调用的答,记在策略名下 —— S-953);答不了 ⇒ 有席交席(席的答原样返回,席自己的
|
|
56
63
|
* fail-closed 语义不动),无席 ⇒ `"unavailable"`(core G1:这一问此刻没有人够得着 ⇒ 改道 durable park;本腿没武装 park ⇒ headless 拒)。
|
|
57
64
|
* 不答的臂**从不**自己拒成 `false`:那会把「交给 park 的人」折成「机器拒了」,durable 审批块的 leader worker 就再也 park 不下来。
|
|
58
65
|
*/
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
export const UNATTENDED_ANSWERED_CLASSES = new Set(["ordinary"]);
|
|
2
|
+
export const UNATTENDED_POLICY_APPROVER = "unattended_class_answer";
|
|
3
|
+
function unattendedPolicyYes() {
|
|
4
|
+
return { allow: true, settledBy: "policy", approver: UNATTENDED_POLICY_APPROVER };
|
|
5
|
+
}
|
|
2
6
|
export function unattendedAnswers(req) {
|
|
3
7
|
const classes = req.classes;
|
|
4
8
|
return classes !== undefined && classes.length > 0 && classes.every((c) => UNATTENDED_ANSWERED_CLASSES.has(c));
|
|
5
9
|
}
|
|
6
10
|
export function createUnattendedOnAsk(seat) {
|
|
7
|
-
return (req, signal) => (unattendedAnswers(req) ?
|
|
11
|
+
return (req, signal) => (unattendedAnswers(req) ? unattendedPolicyYes() : seat !== undefined ? seat(req, signal) : "unavailable");
|
|
8
12
|
}
|
|
9
13
|
export function withUnattendedLeg(spec, seat) {
|
|
10
14
|
return { ...spec, permissionMode: "default", onAsk: createUnattendedOnAsk(seat) };
|
|
@@ -27,10 +27,14 @@
|
|
|
27
27
|
* · `accepted` —— 受理点(`routes/runs.ts` 的 live 腿,**调 `TaskStream.steer` 之前**、回 200 之前)写;写不进 ⇒ 503
|
|
28
28
|
* `steering.ledger_unavailable`,引擎一个字节都没收到(fail-closed:没账的 200 是空头承诺)。身份 = `acceptId`
|
|
29
29
|
* (每次受理一枚;同 Idempotency-Key 的重放共享 `messageId`,但各是一次受理)。`writer` = 受理进程的 `instanceId`。
|
|
30
|
-
* · `settled` —— 本进程对这次受理的守护**正常结束**:`
|
|
30
|
+
* · `settled` —— 本进程对这次受理的守护**正常结束**:`consumed`(S-968 / core 7.39.0 #1273:引擎在承载它的腿上铸了
|
|
31
|
+
* `human_input{delivery:"applied"}`、`inputId` = 本受理的 `messageId` —— 引擎确认把它消费进了转录;腿的事件环把每一帧交
|
|
32
|
+
* {@link UserInputLedger.observeLegEvent},认哪一帧只在本文件判;且引擎收下了**这次受理的调用** —— 路由报 {@link UserInputLedger.confirm},
|
|
33
|
+
* [ref] 7.113.0 opus 腿 L4:同 key 异正文的那次受理会被引擎拒,不能凭同名消费证据先结清)、`leg_end`(承载它的腿在本进程收场 —— done / suspended / needs_review / failed
|
|
31
34
|
* 一律,未消费的那一半 core 已用 `leg_end` 自己告知,本仓不重算「消费了没有」)或 `not_applied`(`TaskStream.steer`
|
|
32
|
-
* 抛了,这次受理没有变成 200;路由随即落这一行)
|
|
33
|
-
* `
|
|
35
|
+
* 抛了,这次受理没有变成 200;路由随即落这一行)。子代腿的 `leg_end`:core 铸在子代自己的会话上,core 7.39.0 #1279(S-980)起同一次收场
|
|
36
|
+
* **再铸一条到父腿**(`detail.sessionId` = 父会话、`taskId` = 父 run、带 `childSessionId`)⇒ 经分流器到人;本账对子代受理落的
|
|
37
|
+
* `settled{leg_end}`(行记父 run,S-966)与那条父口帧说的是同一件事(钉在 `test/engine-notice-wire.test.ts` S-980 两格)。
|
|
34
38
|
* · `converged` —— 收敛器判「受理它的进程已经不在、而它从没 settle」⇒ `cause:"crashed"`(core 闭集里服务层那一臂)。
|
|
35
39
|
* · `announced` —— 通告**落进新 run 的事件账之后**写(`taskId` = 告知它的那条**新** run;`EngineNoticeRouter.routeConfirmed` 等口的落账结果,
|
|
36
40
|
* codex r1-F2):落账失败 ⇒ 不写,下一条 run 再说;重启再重启不重复。唯一的重复形 = 帧已落账而这一行没写成(写失败 / 进程死在两步之间)
|
|
@@ -78,7 +82,7 @@
|
|
|
78
82
|
* 不开旋钮(没有「关掉告知」的正当需求)· 不改 steer 的 200 体(回执仍是「已交付」,账本是它的影子)· 不重放丢失的输入(core 明写
|
|
79
83
|
* NOT redelivered;本账只告知,不替人决定重发)· 不存输入正文(行里只有身份与时刻)。
|
|
80
84
|
*/
|
|
81
|
-
import { type EngineNoticeCode, type UserSteerUndrainedCause } from "@sema-agent/core";
|
|
85
|
+
import { type EngineNoticeCode, type TaskEvent, type UserSteerUndrainedCause } from "@sema-agent/core";
|
|
82
86
|
import { type RunRecord } from "./plugins/store-contracts.js";
|
|
83
87
|
import { type EngineNoticeRouter } from "./trace/engine-notice-wire.js";
|
|
84
88
|
/** local 数据根下的子目录(File 孪生;与 `approval-ask-audit/` 同层同形)。 */
|
|
@@ -90,10 +94,12 @@ export declare const USER_INPUT_KIND_WORDS: {
|
|
|
90
94
|
readonly steer: true;
|
|
91
95
|
};
|
|
92
96
|
/** `settled` 的两种收场(闭集,见顶注)。 */
|
|
93
|
-
export type SettleHow = "leg_end" | "not_applied";
|
|
97
|
+
export type SettleHow = "leg_end" | "not_applied" | "consumed";
|
|
98
|
+
/** 读盘词表(File 孪生的折叠守卫 / SQL 孪生的 `settle_how` 列读腿同读这一张;`consumed` 自 7.113.0 起,≤7.112.x 的读腿不认它 —— 回滚须知在 MIGRATION)。 */
|
|
94
99
|
export declare const SETTLE_HOW_WORDS: {
|
|
95
100
|
readonly leg_end: true;
|
|
96
101
|
readonly not_applied: true;
|
|
102
|
+
readonly consumed: true;
|
|
97
103
|
};
|
|
98
104
|
/** 本服务铸的那一臂(core 删掉这个词 ⇒ `Extract` 得 `never` ⇒ 下面的常量编译红)。 */
|
|
99
105
|
export type CrashedCause = Extract<UserSteerUndrainedCause, "crashed">;
|
|
@@ -293,8 +299,21 @@ export interface UserInputLedger {
|
|
|
293
299
|
}): Promise<UserInputAcceptReceipt>;
|
|
294
300
|
/** 引擎没收下(`TaskStream.steer` 抛)⇒ 落 `settled{not_applied}`。不抛(失败留痕,受理仍挂在腿上,腿收场时照常 settle)。 */
|
|
295
301
|
withdraw(receipt: UserInputAcceptReceipt): Promise<void>;
|
|
302
|
+
/**
|
|
303
|
+
* 引擎收下了这次受理的那一次调用(`TaskStream.steer` / 子代句柄 `steer` resolve)—— {@link withdraw} 的对偶,路由对每次受理恰报其一(经 `routes/runs.ts`
|
|
304
|
+
* 的 `relayAcceptedInput`)。收下之后这次受理才可被消费证据结清([ref] 7.113.0 opus 腿 L4,见 {@link observeLegEvent});消费证据此刻已在这条腿上
|
|
305
|
+
* (消费帧先于本调用到达 / 同 Idempotency-Key 的重放在消费之后才来)⇒ 当场落 `settled{consumed}`。不抛(结清写失败留在腿上,收场照常 `leg_end`)。
|
|
306
|
+
*/
|
|
307
|
+
confirm(receipt: UserInputAcceptReceipt): Promise<void>;
|
|
296
308
|
/** 腿在本进程收场 ⇒ 这条腿上的每一次受理落 `settled{leg_end}`。不抛。 */
|
|
297
309
|
settleLeg(leg: object): Promise<void>;
|
|
310
|
+
/**
|
|
311
|
+
* S-968(core 7.39.0 #1273):腿的事件环把**每一帧**引擎事件交进来(三条腿同一只口;不认的帧零成本返回)。唯一认的一形 =
|
|
312
|
+
* `human_input{delivery:"applied"}`:引擎确认把那条输入消费进了转录 ⇒ 这条腿上 `messageId` = 帧 `inputId`、**且引擎已收下其调用**({@link confirm})的受理
|
|
313
|
+
* (同 Idempotency-Key 的幂等重放一并)落 `settled{consumed}`,离开 open 集 —— 之后写者死也不再按崩溃告知。结清写失败 ⇒ 留在腿上(收场照常落 `leg_end`),不抛。
|
|
314
|
+
* 引擎还没判的受理不结清:messageId 只由 key 派生、账本看不见正文,同 key 异正文的那一次会被引擎拒(`steering.duplicate_input_id`)、走 {@link withdraw}。
|
|
315
|
+
*/
|
|
316
|
+
observeLegEvent(leg: object, ev: TaskEvent): Promise<void>;
|
|
298
317
|
/** 收敛扫描(boot 一次 + 每个维护 tick;判据见顶注)。不抛;返回本次收敛条数。 */
|
|
299
318
|
converge(): Promise<number>;
|
|
300
319
|
/** 新 run 首拍:把本会话已收敛、未告知的受理按旧 run 分组铸通告、投出后落 `announced`。不抛。 */
|
|
@@ -4,7 +4,7 @@ import { isHolderDeathVerdict } from "./plugins/store-contracts.js";
|
|
|
4
4
|
import { defaultEngineNoticeRouter } from "./trace/engine-notice-wire.js";
|
|
5
5
|
export const USER_INPUT_LEDGER_DIR = "user-input-ledger";
|
|
6
6
|
export const USER_INPUT_KIND_WORDS = { steer: true };
|
|
7
|
-
export const SETTLE_HOW_WORDS = { leg_end: true, not_applied: true };
|
|
7
|
+
export const SETTLE_HOW_WORDS = { leg_end: true, not_applied: true, consumed: true };
|
|
8
8
|
const UNDRAINED_CAUSE_MINTER = { leg_end: "engine", crashed: "server" };
|
|
9
9
|
export const CRASHED_CAUSE = "crashed";
|
|
10
10
|
export function isServingLayerUndrainedCause(v) {
|
|
@@ -128,7 +128,7 @@ const USER_STEER_UNDRAINED = "task.user_steer_undrained";
|
|
|
128
128
|
export function buildCrashedSteerNotice(input) {
|
|
129
129
|
return {
|
|
130
130
|
code: USER_STEER_UNDRAINED,
|
|
131
|
-
message: `Check the earlier run's transcript and results before re-sending any of these steers to a live run. The server accepted ${input.steer} user steer(s) for run ${input.taskId} (each answered 200 applied or 202 queued-immediate), but the process running that run ended before the
|
|
131
|
+
message: `Check the earlier run's transcript and results before re-sending any of these steers to a live run. The server accepted ${input.steer} user steer(s) for run ${input.taskId} (each answered 200 applied or 202 queued-immediate), but the process running that run ended before the engine confirmed consuming them. They are NOT redelivered.`,
|
|
132
132
|
detail: { steer: input.steer, cause: CRASHED_CAUSE, taskId: input.taskId, sessionId: input.sessionId },
|
|
133
133
|
sessionId: input.sessionId,
|
|
134
134
|
};
|
|
@@ -157,13 +157,25 @@ export function createUserInputLedger(opts) {
|
|
|
157
157
|
const { store, writer, evidence } = opts;
|
|
158
158
|
const now = opts.now ?? Date.now;
|
|
159
159
|
const legs = new WeakMap();
|
|
160
|
+
const consumedOnLeg = new WeakMap();
|
|
161
|
+
const settleConsumed = async (leg, acceptId) => {
|
|
162
|
+
try {
|
|
163
|
+
await store.settle(acceptId, "consumed", now());
|
|
164
|
+
legs.get(leg)?.delete(acceptId);
|
|
165
|
+
liveHere.delete(acceptId);
|
|
166
|
+
}
|
|
167
|
+
catch (e) {
|
|
168
|
+
recordFailOpen("server.user-input-ledger.append-failed", `op=consumed ${errText(e)}`);
|
|
169
|
+
}
|
|
170
|
+
};
|
|
160
171
|
const liveHere = new Set();
|
|
161
|
-
const track = (leg, acceptId) => {
|
|
162
|
-
const
|
|
163
|
-
|
|
164
|
-
|
|
172
|
+
const track = (leg, acceptId, messageId) => {
|
|
173
|
+
const entry = { messageId, taken: false };
|
|
174
|
+
const onLeg = legs.get(leg);
|
|
175
|
+
if (onLeg)
|
|
176
|
+
onLeg.set(acceptId, entry);
|
|
165
177
|
else
|
|
166
|
-
legs.set(leg, new
|
|
178
|
+
legs.set(leg, new Map([[acceptId, entry]]));
|
|
167
179
|
};
|
|
168
180
|
const pageSize = opts.scanBudget?.pageSize ?? USER_INPUT_OPEN_SCAN_MAX;
|
|
169
181
|
const maxPages = opts.scanBudget?.maxPages ?? USER_INPUT_OPEN_SCAN_PAGES;
|
|
@@ -239,9 +251,17 @@ export function createUserInputLedger(opts) {
|
|
|
239
251
|
liveHere.delete(acceptId);
|
|
240
252
|
throw e;
|
|
241
253
|
}
|
|
242
|
-
track(input.leg, acceptId);
|
|
254
|
+
track(input.leg, acceptId, input.messageId);
|
|
243
255
|
return { acceptId, leg: input.leg };
|
|
244
256
|
},
|
|
257
|
+
async confirm(receipt) {
|
|
258
|
+
const entry = legs.get(receipt.leg)?.get(receipt.acceptId);
|
|
259
|
+
if (entry === undefined)
|
|
260
|
+
return;
|
|
261
|
+
entry.taken = true;
|
|
262
|
+
if (consumedOnLeg.get(receipt.leg)?.has(entry.messageId) === true)
|
|
263
|
+
await settleConsumed(receipt.leg, receipt.acceptId);
|
|
264
|
+
},
|
|
245
265
|
async withdraw(receipt) {
|
|
246
266
|
legs.get(receipt.leg)?.delete(receipt.acceptId);
|
|
247
267
|
try {
|
|
@@ -255,11 +275,11 @@ export function createUserInputLedger(opts) {
|
|
|
255
275
|
}
|
|
256
276
|
},
|
|
257
277
|
async settleLeg(leg) {
|
|
258
|
-
const
|
|
259
|
-
if (!
|
|
278
|
+
const onLeg = legs.get(leg);
|
|
279
|
+
if (!onLeg)
|
|
260
280
|
return;
|
|
261
281
|
legs.delete(leg);
|
|
262
|
-
for (const acceptId of
|
|
282
|
+
for (const acceptId of onLeg.keys()) {
|
|
263
283
|
try {
|
|
264
284
|
await store.settle(acceptId, "leg_end", now());
|
|
265
285
|
}
|
|
@@ -271,6 +291,21 @@ export function createUserInputLedger(opts) {
|
|
|
271
291
|
}
|
|
272
292
|
}
|
|
273
293
|
},
|
|
294
|
+
async observeLegEvent(leg, ev) {
|
|
295
|
+
if (ev.type !== "human_input" || ev.delivery !== "applied")
|
|
296
|
+
return;
|
|
297
|
+
const seen = consumedOnLeg.get(leg);
|
|
298
|
+
if (seen)
|
|
299
|
+
seen.add(ev.inputId);
|
|
300
|
+
else
|
|
301
|
+
consumedOnLeg.set(leg, new Set([ev.inputId]));
|
|
302
|
+
const onLeg = legs.get(leg);
|
|
303
|
+
if (!onLeg)
|
|
304
|
+
return;
|
|
305
|
+
const due = [...onLeg].flatMap(([acceptId, entry]) => (entry.messageId === ev.inputId && entry.taken ? [acceptId] : []));
|
|
306
|
+
for (const acceptId of due)
|
|
307
|
+
await settleConsumed(leg, acceptId);
|
|
308
|
+
},
|
|
274
309
|
converge() {
|
|
275
310
|
inFlight ??= convergePass().finally(() => {
|
|
276
311
|
inFlight = undefined;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sema-agent/server",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.113.0",
|
|
4
4
|
"description": "Sema Server — the server/API implementation layer for Sema, wiring core, registry, model providers, and cloud agent execution. Built on @sema-agent/core.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "BUSL-1.1",
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
"!dist/run-local-linux-x64",
|
|
29
29
|
"!dist/run-local-darwin-arm64",
|
|
30
30
|
"skills",
|
|
31
|
+
"scripts/retired-mode-seed-drain-local.mjs",
|
|
31
32
|
"deploy/sema-up",
|
|
32
33
|
"docs/DEVICE-EXECUTOR-PROTOCOL.md",
|
|
33
34
|
"USAGE.md",
|
|
@@ -61,7 +62,7 @@
|
|
|
61
62
|
"build:binary:run-local:darwin-arm64": "bun build --compile --target=bun-darwin-arm64 src/run-local.ts --outfile dist/run-local-darwin-arm64"
|
|
62
63
|
},
|
|
63
64
|
"dependencies": {
|
|
64
|
-
"@sema-agent/core": "7.
|
|
65
|
+
"@sema-agent/core": "7.39.1",
|
|
65
66
|
"@sema-agent/settings-schema": "6.4.0",
|
|
66
67
|
"e2b": "^2.28.0",
|
|
67
68
|
"libsodium-wrappers": "^0.8.4",
|
|
@@ -77,7 +78,7 @@
|
|
|
77
78
|
"sharp": "^0.35.3"
|
|
78
79
|
},
|
|
79
80
|
"devDependencies": {
|
|
80
|
-
"@sema-agent/sdk": "15.
|
|
81
|
+
"@sema-agent/sdk": "15.3.0",
|
|
81
82
|
"@types/libsodium-wrappers": "^0.7.14",
|
|
82
83
|
"@types/node": "22.10.2",
|
|
83
84
|
"@types/pg": "^8.20.0",
|