pi-subagents 0.78.0 → 0.79.1
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/CHANGELOG.md +68 -0
- package/docs/agents.md +4 -2
- package/docs/configuration.md +4 -4
- package/docs/extension-api.md +4 -0
- package/docs/observability.md +11 -3
- package/docs/tool-reference.md +12 -1
- package/docs/workflows.md +6 -4
- package/package.json +1 -1
- package/skills/pi-subagents/SKILL.md +1 -0
- package/skills/pi-subagents/references/execution-controls.md +2 -0
- package/src/extension/declaration-pinning.d.ts.map +1 -1
- package/src/extension/declaration-pinning.js +15 -1
- package/src/extension/declaration-pinning.js.map +1 -1
- package/src/extension/index.d.ts.map +1 -1
- package/src/extension/index.js +19 -4
- package/src/extension/index.js.map +1 -1
- package/src/extension/public-execution.d.ts +1 -0
- package/src/extension/public-execution.d.ts.map +1 -1
- package/src/extension/public-execution.js +3 -0
- package/src/extension/public-execution.js.map +1 -1
- package/src/extension/rpc.d.ts.map +1 -1
- package/src/extension/rpc.js +5 -3
- package/src/extension/rpc.js.map +1 -1
- package/src/extension/schemas.d.ts +2 -0
- package/src/extension/schemas.d.ts.map +1 -1
- package/src/extension/schemas.js +1 -0
- package/src/extension/schemas.js.map +1 -1
- package/src/extension/tool-activation.d.ts +1 -0
- package/src/extension/tool-activation.d.ts.map +1 -1
- package/src/extension/tool-activation.js +57 -18
- package/src/extension/tool-activation.js.map +1 -1
- package/src/extension/upgrade-notice.d.ts.map +1 -1
- package/src/extension/upgrade-notice.js +7 -1
- package/src/extension/upgrade-notice.js.map +1 -1
- package/src/intercom/native-supervisor-channel.d.ts +2 -1
- package/src/intercom/native-supervisor-channel.d.ts.map +1 -1
- package/src/intercom/native-supervisor-channel.js +117 -9
- package/src/intercom/native-supervisor-channel.js.map +1 -1
- package/src/runs/background/async-execution.d.ts.map +1 -1
- package/src/runs/background/async-execution.js +13 -16
- package/src/runs/background/async-execution.js.map +1 -1
- package/src/runs/background/async-job-tracker.d.ts.map +1 -1
- package/src/runs/background/async-job-tracker.js +8 -0
- package/src/runs/background/async-job-tracker.js.map +1 -1
- package/src/runs/background/async-resume.d.ts.map +1 -1
- package/src/runs/background/async-resume.js +2 -1
- package/src/runs/background/async-resume.js.map +1 -1
- package/src/runs/background/async-status-snapshot.d.ts.map +1 -1
- package/src/runs/background/async-status-snapshot.js +4 -2
- package/src/runs/background/async-status-snapshot.js.map +1 -1
- package/src/runs/background/async-status.d.ts.map +1 -1
- package/src/runs/background/async-status.js +16 -8
- package/src/runs/background/async-status.js.map +1 -1
- package/src/runs/background/inspect-rpc.d.ts +5 -0
- package/src/runs/background/inspect-rpc.d.ts.map +1 -1
- package/src/runs/background/inspect-rpc.js +20 -3
- package/src/runs/background/inspect-rpc.js.map +1 -1
- package/src/runs/background/result-delivery-ownership.d.ts +0 -2
- package/src/runs/background/result-delivery-ownership.d.ts.map +1 -1
- package/src/runs/background/result-delivery-ownership.js +5 -21
- package/src/runs/background/result-delivery-ownership.js.map +1 -1
- package/src/runs/background/result-files.d.ts +5 -3
- package/src/runs/background/result-files.d.ts.map +1 -1
- package/src/runs/background/result-files.js +10 -6
- package/src/runs/background/result-files.js.map +1 -1
- package/src/runs/background/result-watcher.d.ts.map +1 -1
- package/src/runs/background/result-watcher.js +15 -8
- package/src/runs/background/result-watcher.js.map +1 -1
- package/src/runs/background/resume-guidance.d.ts.map +1 -1
- package/src/runs/background/resume-guidance.js +3 -2
- package/src/runs/background/resume-guidance.js.map +1 -1
- package/src/runs/background/run-child-session.d.ts.map +1 -1
- package/src/runs/background/run-child-session.js +7 -4
- package/src/runs/background/run-child-session.js.map +1 -1
- package/src/runs/background/run-status.d.ts.map +1 -1
- package/src/runs/background/run-status.js +11 -4
- package/src/runs/background/run-status.js.map +1 -1
- package/src/runs/background/stale-run-reconciler.d.ts.map +1 -1
- package/src/runs/background/stale-run-reconciler.js +53 -5
- package/src/runs/background/stale-run-reconciler.js.map +1 -1
- package/src/runs/background/subagent-runner.d.ts.map +1 -1
- package/src/runs/background/subagent-runner.js +15 -5
- package/src/runs/background/subagent-runner.js.map +1 -1
- package/src/runs/background/workflow-terminal-proof.d.ts +18 -1
- package/src/runs/background/workflow-terminal-proof.d.ts.map +1 -1
- package/src/runs/background/workflow-terminal-proof.js +27 -0
- package/src/runs/background/workflow-terminal-proof.js.map +1 -1
- package/src/runs/foreground/async-dismiss-action.d.ts.map +1 -1
- package/src/runs/foreground/async-dismiss-action.js +2 -1
- package/src/runs/foreground/async-dismiss-action.js.map +1 -1
- package/src/runs/foreground/async-steering-action.d.ts.map +1 -1
- package/src/runs/foreground/async-steering-action.js +3 -2
- package/src/runs/foreground/async-steering-action.js.map +1 -1
- package/src/runs/foreground/async-stop-action.d.ts +1 -0
- package/src/runs/foreground/async-stop-action.d.ts.map +1 -1
- package/src/runs/foreground/async-stop-action.js +3 -1
- package/src/runs/foreground/async-stop-action.js.map +1 -1
- package/src/runs/foreground/command-action.d.ts.map +1 -1
- package/src/runs/foreground/command-action.js +2 -1
- package/src/runs/foreground/command-action.js.map +1 -1
- package/src/runs/foreground/execution.d.ts.map +1 -1
- package/src/runs/foreground/execution.js +18 -7
- package/src/runs/foreground/execution.js.map +1 -1
- package/src/runs/foreground/subagent-executor.d.ts +2 -0
- package/src/runs/foreground/subagent-executor.d.ts.map +1 -1
- package/src/runs/foreground/subagent-executor.js +98 -32
- package/src/runs/foreground/subagent-executor.js.map +1 -1
- package/src/runs/shared/async-status-projection.d.ts +4 -0
- package/src/runs/shared/async-status-projection.d.ts.map +1 -1
- package/src/runs/shared/async-status-projection.js +23 -1
- package/src/runs/shared/async-status-projection.js.map +1 -1
- package/src/runs/shared/child-commands.d.ts +2 -0
- package/src/runs/shared/child-commands.d.ts.map +1 -1
- package/src/runs/shared/child-commands.js +4 -0
- package/src/runs/shared/child-commands.js.map +1 -1
- package/src/runs/shared/child-runtime-config.d.ts +6 -0
- package/src/runs/shared/child-runtime-config.d.ts.map +1 -1
- package/src/runs/shared/child-runtime-config.js +6 -0
- package/src/runs/shared/child-runtime-config.js.map +1 -1
- package/src/runs/shared/child-session.d.ts +6 -6
- package/src/runs/shared/child-session.d.ts.map +1 -1
- package/src/runs/shared/child-session.js +111 -51
- package/src/runs/shared/child-session.js.map +1 -1
- package/src/runs/shared/long-running-guard.d.ts +3 -1
- package/src/runs/shared/long-running-guard.d.ts.map +1 -1
- package/src/runs/shared/long-running-guard.js +75 -17
- package/src/runs/shared/long-running-guard.js.map +1 -1
- package/src/runs/shared/model-resolution.d.ts +5 -1
- package/src/runs/shared/model-resolution.d.ts.map +1 -1
- package/src/runs/shared/model-resolution.js +8 -1
- package/src/runs/shared/model-resolution.js.map +1 -1
- package/src/runs/shared/nested-events.d.ts.map +1 -1
- package/src/runs/shared/nested-events.js +2 -0
- package/src/runs/shared/nested-events.js.map +1 -1
- package/src/runs/shared/pi-spawn.d.ts +5 -1
- package/src/runs/shared/pi-spawn.d.ts.map +1 -1
- package/src/runs/shared/pi-spawn.js +86 -30
- package/src/runs/shared/pi-spawn.js.map +1 -1
- package/src/runs/shared/run-ownership.d.ts +4 -0
- package/src/runs/shared/run-ownership.d.ts.map +1 -0
- package/src/runs/shared/run-ownership.js +9 -0
- package/src/runs/shared/run-ownership.js.map +1 -0
- package/src/runs/shared/subagent-control.d.ts +1 -0
- package/src/runs/shared/subagent-control.d.ts.map +1 -1
- package/src/runs/shared/subagent-control.js +2 -1
- package/src/runs/shared/subagent-control.js.map +1 -1
- package/src/runs/shared/subagent-prompt-runtime.d.ts +45 -18
- package/src/runs/shared/subagent-prompt-runtime.d.ts.map +1 -1
- package/src/runs/shared/subagent-prompt-runtime.js +160 -59
- package/src/runs/shared/subagent-prompt-runtime.js.map +1 -1
- package/src/shared/file-lease.d.ts +7 -1
- package/src/shared/file-lease.d.ts.map +1 -1
- package/src/shared/file-lease.js +8 -2
- package/src/shared/file-lease.js.map +1 -1
- package/src/shared/fork-context.d.ts +3 -1
- package/src/shared/fork-context.d.ts.map +1 -1
- package/src/shared/fork-context.js +23 -13
- package/src/shared/fork-context.js.map +1 -1
- package/src/shared/session-succession.d.ts +5 -0
- package/src/shared/session-succession.d.ts.map +1 -0
- package/src/shared/session-succession.js +25 -0
- package/src/shared/session-succession.js.map +1 -0
- package/src/shared/types.d.ts +15 -1
- package/src/shared/types.d.ts.map +1 -1
- package/src/shared/types.js +3 -0
- package/src/shared/types.js.map +1 -1
- package/src/shared/utils.d.ts +11 -0
- package/src/shared/utils.d.ts.map +1 -1
- package/src/shared/utils.js +17 -0
- package/src/shared/utils.js.map +1 -1
- package/src/slash/slash-commands.d.ts.map +1 -1
- package/src/slash/slash-commands.js +2 -2
- package/src/slash/slash-commands.js.map +1 -1
- package/src/watchdog/register-main.js +2 -2
- package/src/watchdog/register-main.js.map +1 -1
- package/src/watchdog/runtime.d.ts.map +1 -1
- package/src/watchdog/runtime.js +3 -5
- package/src/watchdog/runtime.js.map +1 -1
- package/src/workflows/scripted-workflow.d.ts +1 -1
- package/src/workflows/scripted-workflow.d.ts.map +1 -1
- package/src/workflows/workflow-child-summary.d.ts +5 -0
- package/src/workflows/workflow-child-summary.d.ts.map +1 -1
- package/src/workflows/workflow-child-summary.js +10 -0
- package/src/workflows/workflow-child-summary.js.map +1 -1
- package/src/workflows/workflow-reuse.d.ts +6 -1
- package/src/workflows/workflow-reuse.d.ts.map +1 -1
- package/src/workflows/workflow-reuse.js +22 -1
- package/src/workflows/workflow-reuse.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../src/extension/schemas.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../src/extension/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,6 @@ import type { ToolActivationMode } from "../shared/types.ts";
|
|
|
3
3
|
export declare function registerSubagentToolActivation(pi: ExtensionAPI, options: {
|
|
4
4
|
advertisedPrompt: () => string | undefined | Promise<string | undefined>;
|
|
5
5
|
mode?: ToolActivationMode;
|
|
6
|
+
hasPendingSupervisorRequest?: () => boolean;
|
|
6
7
|
}): void;
|
|
7
8
|
//# sourceMappingURL=tool-activation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-activation.d.ts","sourceRoot":"","sources":["../../../src/extension/tool-activation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAoC,MAAM,iCAAiC,CAAC;AAGtG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-activation.d.ts","sourceRoot":"","sources":["../../../src/extension/tool-activation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAoC,MAAM,iCAAiC,CAAC;AAGtG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AA2G7D,wBAAgB,8BAA8B,CAC7C,EAAE,EAAE,YAAY,EAChB,OAAO,EAAE;IAAE,gBAAgB,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAAC,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAAC,2BAA2B,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,GAC3J,IAAI,CAoEN"}
|
|
@@ -1,21 +1,30 @@
|
|
|
1
1
|
import { Type } from "typebox";
|
|
2
2
|
import { MODEL_ONLY_TOOL } from "../shared/extension-context.js";
|
|
3
3
|
import { registerPinnedTool } from "./declaration-pinning.js";
|
|
4
|
-
import {
|
|
4
|
+
import { listBackgroundWorkProviders } from "../api/background-work.js";
|
|
5
|
+
import { CONTACT_SUPERVISOR_TOOL_NAME as SUPERVISOR_NAME, NATIVE_SUPERVISOR_TOOL_NAME as PARENT_SUPERVISOR_NAME } from "../intercom/native-supervisor-channel.js";
|
|
5
6
|
const LOADER_NAME = "subagents_enable";
|
|
6
7
|
const SUBAGENT_NAME = "subagent";
|
|
8
|
+
// Declared with subagent, or once background-work providers exist (they report work only bg_wait reads).
|
|
9
|
+
const WAIT_NAME = "bg_wait";
|
|
7
10
|
// SUPERVISOR_NAME is declared with subagent: a fork launched through it then declares exactly this session's tools.
|
|
11
|
+
// PARENT_SUPERVISOR_NAME (answering this session's children) is declared with subagent too, unless the session already
|
|
12
|
+
// declared it: a changed tool set would miss the prompt cache. The channel declares it when a child request arrives.
|
|
13
|
+
const UNLOAD_SENTINELS = new Set([LOADER_NAME, SUBAGENT_NAME, WAIT_NAME]);
|
|
8
14
|
let warnedUnsupportedHost = false;
|
|
9
15
|
function hasNativeToolSelection(messages) {
|
|
10
16
|
return messages.some((message) => message.role === "system"
|
|
11
17
|
&& (Object.hasOwn(message, "toolsAdded") || Object.hasOwn(message, "toolsRemoved")));
|
|
12
18
|
}
|
|
13
|
-
function setSelection(pi, includeSubagent, includeLoader) {
|
|
14
|
-
const next = pi.getActiveTools().filter((name) => (includeSubagent || (name !== SUBAGENT_NAME && name !== SUPERVISOR_NAME
|
|
19
|
+
function setSelection(pi, includeSubagent, includeLoader, includeWait, restore = [], keepParentSupervisor = false) {
|
|
20
|
+
const next = [...pi.getActiveTools(), ...restore].filter((name) => (includeSubagent || (name !== SUBAGENT_NAME && name !== SUPERVISOR_NAME && (keepParentSupervisor || name !== PARENT_SUPERVISOR_NAME)))
|
|
21
|
+
&& (includeLoader || name !== LOADER_NAME) && (includeWait || name !== WAIT_NAME));
|
|
15
22
|
if (includeSubagent)
|
|
16
|
-
next.push(SUBAGENT_NAME, SUPERVISOR_NAME);
|
|
23
|
+
next.push(SUBAGENT_NAME, SUPERVISOR_NAME, PARENT_SUPERVISOR_NAME);
|
|
17
24
|
if (includeLoader)
|
|
18
25
|
next.push(LOADER_NAME);
|
|
26
|
+
if (includeWait)
|
|
27
|
+
next.push(WAIT_NAME);
|
|
19
28
|
pi.setActiveTools([...new Set(next)]);
|
|
20
29
|
}
|
|
21
30
|
// Mirrors pi-ai's per-API transcript handling: without these flags, a mid-conversation tool change
|
|
@@ -33,8 +42,8 @@ function addsToolsWithoutCheckpoint(model) {
|
|
|
33
42
|
default: return false;
|
|
34
43
|
}
|
|
35
44
|
}
|
|
36
|
-
// Returns whether the loader is selected for this session.
|
|
37
|
-
function applyRecordedSelection(pi, ctx, mode) {
|
|
45
|
+
// Returns whether the loader is selected for this session. `replyOwed`: a child request already woke this session.
|
|
46
|
+
function applyRecordedSelection(pi, ctx, mode, replyOwed) {
|
|
38
47
|
const available = pi.getAllTools();
|
|
39
48
|
if (!Array.isArray(available) || !Array.isArray(pi.getActiveTools()))
|
|
40
49
|
return true;
|
|
@@ -45,22 +54,45 @@ function applyRecordedSelection(pi, ctx, mode) {
|
|
|
45
54
|
if (hasNativeToolSelection(messages)) {
|
|
46
55
|
// Replayed here because a package-local pi-ai may be older than the running Pi.
|
|
47
56
|
const recorded = new Set();
|
|
57
|
+
const unloadedNames = new Set();
|
|
58
|
+
const declaredSentinels = new Set();
|
|
48
59
|
for (const message of messages) {
|
|
49
60
|
if (message.role !== "system")
|
|
50
61
|
continue;
|
|
62
|
+
// Pi records an extension unload (update, reload) as a removal of each of its active tools, with no cause.
|
|
63
|
+
// While this extension is loaded, the loader, subagent or bg_wait stays declared, so a removal that leaves
|
|
64
|
+
// none of them is that unload, not a choice, and the selection from before it stands.
|
|
51
65
|
for (const tool of message.toolsRemoved ?? [])
|
|
52
|
-
|
|
66
|
+
declaredSentinels.delete(tool.name);
|
|
67
|
+
for (const tool of message.toolsAdded ?? [])
|
|
68
|
+
if (UNLOAD_SENTINELS.has(tool.name))
|
|
69
|
+
declaredSentinels.add(tool.name);
|
|
70
|
+
const unloaded = declaredSentinels.size === 0 && message.toolsRemoved?.some((tool) => UNLOAD_SENTINELS.has(tool.name));
|
|
71
|
+
for (const tool of message.toolsRemoved ?? []) {
|
|
72
|
+
if (unloaded)
|
|
73
|
+
unloadedNames.add(tool.name);
|
|
74
|
+
else
|
|
75
|
+
recorded.delete(tool.name);
|
|
76
|
+
}
|
|
53
77
|
for (const tool of message.toolsAdded ?? [])
|
|
54
78
|
recorded.add(tool.name);
|
|
55
79
|
}
|
|
56
80
|
// "auto" never adds the loader to a transcript that did not declare it: that is itself a tool change.
|
|
57
81
|
const loaderSelected = mode === "dynamic" || recorded.has(LOADER_NAME);
|
|
58
|
-
|
|
82
|
+
// A new process restores the transcript's tools, where the unload left this extension's tools inactive; only
|
|
83
|
+
// /reload re-adds them. Restoring them keeps a sentinel declared, so a later unload is recognised too. Tools of
|
|
84
|
+
// other extensions, and tools excluded for this process (not registered, so not in getAllTools), stay as they are.
|
|
85
|
+
const source = unloadedNames.size > 0 ? available.find((tool) => tool.name === LOADER_NAME)?.sourceInfo.path : undefined;
|
|
86
|
+
const restore = source === undefined ? [] : available
|
|
87
|
+
.filter((tool) => unloadedNames.has(tool.name) && recorded.has(tool.name) && tool.sourceInfo.path === source)
|
|
88
|
+
.map((tool) => tool.name);
|
|
89
|
+
setSelection(pi, recorded.has(SUBAGENT_NAME), loaderSelected, recorded.has(WAIT_NAME), replyOwed ? [...restore, PARENT_SUPERVISOR_NAME] : restore, replyOwed || recorded.has(PARENT_SUPERVISOR_NAME));
|
|
59
90
|
return loaderSelected;
|
|
60
91
|
}
|
|
61
92
|
// "auto" goes eager only for an empty session; any history keeps the tools it already sent.
|
|
62
93
|
const eager = mode === "auto" && messages.length === 0 && !addsToolsWithoutCheckpoint(ctx.model);
|
|
63
|
-
|
|
94
|
+
const kept = (name) => eager || (messages.length > 0 && pi.getActiveTools().includes(name));
|
|
95
|
+
setSelection(pi, kept(SUBAGENT_NAME), !eager, kept(WAIT_NAME), replyOwed ? [PARENT_SUPERVISOR_NAME] : [], replyOwed || messages.length > 0);
|
|
64
96
|
return !eager;
|
|
65
97
|
}
|
|
66
98
|
export function registerSubagentToolActivation(pi, options) {
|
|
@@ -92,7 +124,7 @@ export function registerSubagentToolActivation(pi, options) {
|
|
|
92
124
|
details: { unavailable: [SUBAGENT_NAME] },
|
|
93
125
|
};
|
|
94
126
|
try {
|
|
95
|
-
setSelection(pi, true, true);
|
|
127
|
+
setSelection(pi, true, true, true);
|
|
96
128
|
}
|
|
97
129
|
catch (error) {
|
|
98
130
|
return {
|
|
@@ -117,19 +149,26 @@ export function registerSubagentToolActivation(pi, options) {
|
|
|
117
149
|
registerPinnedTool(pi, loader);
|
|
118
150
|
// Decided at session start and tree navigation only; switching models keeps the session's tools.
|
|
119
151
|
let loaderSelected = true;
|
|
120
|
-
|
|
121
|
-
pi.on("
|
|
152
|
+
const replyOwed = () => options.hasPendingSupervisorRequest?.() === true;
|
|
153
|
+
pi.on("session_start", (_event, ctx) => { loaderSelected = applyRecordedSelection(pi, ctx, mode, replyOwed()); });
|
|
154
|
+
pi.on("session_tree", (_event, ctx) => { loaderSelected = applyRecordedSelection(pi, ctx, mode, replyOwed()); });
|
|
122
155
|
pi.on("before_agent_start", (event) => {
|
|
123
|
-
if (!loaderSelected)
|
|
124
|
-
return;
|
|
125
156
|
const available = pi.getAllTools();
|
|
126
157
|
if (!Array.isArray(available) || !available.some((tool) => tool.name === LOADER_NAME))
|
|
127
158
|
return;
|
|
159
|
+
// Another extension's background-work provider reports work only bg_wait can wait for, so a session with one
|
|
160
|
+
// declares bg_wait without enabling subagent, including when the provider registered after session start.
|
|
161
|
+
const providedWait = available.some((tool) => tool.name === WAIT_NAME) && listBackgroundWorkProviders().length > 0;
|
|
162
|
+
const names = [...(loaderSelected ? [LOADER_NAME] : []), ...(providedWait ? [WAIT_NAME] : [])];
|
|
163
|
+
if (names.length === 0)
|
|
164
|
+
return;
|
|
128
165
|
const selectedTools = event.systemPromptOptions.selectedTools ??= [...pi.getActiveTools()];
|
|
129
|
-
|
|
130
|
-
selectedTools.
|
|
131
|
-
|
|
132
|
-
|
|
166
|
+
for (const name of names)
|
|
167
|
+
if (!selectedTools.includes(name))
|
|
168
|
+
selectedTools.push(name);
|
|
169
|
+
const inactive = names.filter((name) => !pi.getActiveTools().includes(name));
|
|
170
|
+
if (inactive.length > 0)
|
|
171
|
+
pi.setActiveTools([...pi.getActiveTools(), ...inactive]);
|
|
133
172
|
});
|
|
134
173
|
}
|
|
135
174
|
//# sourceMappingURL=tool-activation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-activation.js","sourceRoot":"","sources":["../../../src/extension/tool-activation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,IAAI,eAAe,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-activation.js","sourceRoot":"","sources":["../../../src/extension/tool-activation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-notice.d.ts","sourceRoot":"","sources":["../../../src/extension/upgrade-notice.ts"],"names":[],"mappings":"AAYA,wBAAsB,iBAAiB,CACtC,GAAG,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE;QAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,EAC5E,QAAQ,SAA2C,EACnD,aAAa,SAAgE,EAC7E,OAAO,SAAsB,GAC3B,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"upgrade-notice.d.ts","sourceRoot":"","sources":["../../../src/extension/upgrade-notice.ts"],"names":[],"mappings":"AAYA,wBAAsB,iBAAiB,CACtC,GAAG,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE;QAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,EAC5E,QAAQ,SAA2C,EACnD,aAAa,SAAgE,EAC7E,OAAO,SAAsB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Bf"}
|
|
@@ -17,7 +17,13 @@ export async function showUpgradeNotice(ctx, stateDir = path.join(getAgentDir(),
|
|
|
17
17
|
const current = versionNumber(version);
|
|
18
18
|
if (current === undefined || previous === current)
|
|
19
19
|
return;
|
|
20
|
-
|
|
20
|
+
try {
|
|
21
|
+
writeAtomicJson(statePath, { version });
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
// Read-only installs cannot record the seen version. Without it the notice would repeat on every start, so skip it.
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
21
27
|
if (previous === undefined || previous > current)
|
|
22
28
|
return;
|
|
23
29
|
const bullets = (await fs.promises.readFile(changelogPath, "utf-8")).split(/^## /m).flatMap((section) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-notice.js","sourceRoot":"","sources":["../../../src/extension/upgrade-notice.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,WAAW,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,2EAA2E;AAC3E,MAAM,aAAa,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;IACzG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,SAAS,CAAC;AAEb,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACtC,GAA4E,EAC5E,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,cAAc,CAAC,EACnD,aAAa,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAC7E,OAAO,GAAG,WAAW,CAAC,OAAO;IAE7B,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO;IACvB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9H,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,OAAO,KAAK,SAAS,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO;IAC1D,eAAe,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"upgrade-notice.js","sourceRoot":"","sources":["../../../src/extension/upgrade-notice.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import * as fs from "node:fs";
|
|
|
2
2
|
import type { ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-agent";
|
|
3
3
|
import { Type } from "typebox";
|
|
4
4
|
import type { ChildSupervisorMetadata } from "../runs/shared/child-runtime-config.ts";
|
|
5
|
+
import type { ParentWake } from "../shared/parent-wake.ts";
|
|
5
6
|
import { type ControlEvent, type SubagentState } from "../shared/types.ts";
|
|
6
7
|
import { type SupervisorReason } from "./supervisor-ui.ts";
|
|
7
8
|
export declare const NATIVE_SUPERVISOR_TOOL_NAME = "subagent_supervisor";
|
|
@@ -36,7 +37,7 @@ interface NativeSupervisorChannelDeps {
|
|
|
36
37
|
};
|
|
37
38
|
/** Retained scheduled states for the current runtime owner, never foreign owners. */
|
|
38
39
|
getCurrentOwnerStates?: () => Iterable<SubagentState>;
|
|
39
|
-
parentWake?: Pick<
|
|
40
|
+
parentWake?: Pick<ParentWake, "sendMessage">;
|
|
40
41
|
platform?: NodeJS.Platform;
|
|
41
42
|
watch?: SupervisorWatch;
|
|
42
43
|
timers?: Pick<typeof globalThis, "setInterval" | "clearInterval" | "setImmediate" | "clearImmediate">;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-supervisor-channel.d.ts","sourceRoot":"","sources":["../../../src/intercom/native-supervisor-channel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAG9B,OAAO,KAAK,EAAwD,YAAY,
|
|
1
|
+
{"version":3,"file":"native-supervisor-channel.d.ts","sourceRoot":"","sources":["../../../src/intercom/native-supervisor-channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,11 @@ import { randomUUID } from "node:crypto";
|
|
|
2
2
|
import * as fs from "node:fs";
|
|
3
3
|
import * as path from "node:path";
|
|
4
4
|
import { Type } from "typebox";
|
|
5
|
-
import { INTERCOM_DETACH_REQUEST_EVENT, POLL_INTERVAL_MS, TEMP_ROOT_DIR } from "../shared/types.js";
|
|
6
|
-
import {
|
|
5
|
+
import { ASYNC_DIR, INTERCOM_DETACH_REQUEST_EVENT, POLL_INTERVAL_MS, TEMP_ROOT_DIR } from "../shared/types.js";
|
|
6
|
+
import { readStatus } from "../shared/utils.js";
|
|
7
|
+
import { inheritedSessionIds } from "../shared/session-succession.js";
|
|
8
|
+
import { ownsRun } from "../runs/shared/run-ownership.js";
|
|
9
|
+
import { writeAtomicJson, writePrivateAtomicJson } from "../shared/atomic-json.js";
|
|
7
10
|
import { shouldUseNativeFsWatch } from "../shared/watch-strategy.js";
|
|
8
11
|
import { MODEL_ONLY_TOOL } from "../shared/extension-context.js";
|
|
9
12
|
import { SUPERVISOR_REQUEST_MESSAGE_TYPE, SUPERVISOR_REPLY_ENTRY_TYPE, supervisorReplyHint, } from "./supervisor-ui.js";
|
|
@@ -90,8 +93,20 @@ function delay(ms, signal) {
|
|
|
90
93
|
signal?.addEventListener("abort", onAbort, { once: true });
|
|
91
94
|
});
|
|
92
95
|
}
|
|
93
|
-
|
|
96
|
+
/** The owning parent moves `expiresAt` forward while Pi still holds the request's notice back from its model. */
|
|
97
|
+
function extendedDeadline(requestFile, deadline) {
|
|
98
|
+
try {
|
|
99
|
+
const expiresAt = JSON.parse(fs.readFileSync(requestFile, "utf-8")).expiresAt;
|
|
100
|
+
return typeof expiresAt === "number" && Number.isFinite(expiresAt) ? Math.max(deadline, expiresAt) : deadline;
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
return deadline;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
async function waitForReply(channelDir, requestId, initialDeadline, signal) {
|
|
94
107
|
const file = replyPath(channelDir, requestId);
|
|
108
|
+
const request = requestPath(channelDir, requestId);
|
|
109
|
+
let deadline = initialDeadline;
|
|
95
110
|
while (Date.now() <= deadline) {
|
|
96
111
|
if (signal?.aborted)
|
|
97
112
|
throw new Error("Supervisor request cancelled.");
|
|
@@ -102,6 +117,7 @@ async function waitForReply(channelDir, requestId, deadline, signal) {
|
|
|
102
117
|
}
|
|
103
118
|
}
|
|
104
119
|
await delay(250, signal);
|
|
120
|
+
deadline = extendedDeadline(request, deadline);
|
|
105
121
|
}
|
|
106
122
|
throw new Error("Timed out waiting for supervisor reply.");
|
|
107
123
|
}
|
|
@@ -345,7 +361,21 @@ function cleanupStaleEmptySupervisorChannels(nowMs = Date.now(), platform = proc
|
|
|
345
361
|
}
|
|
346
362
|
function requestMatchesOwner(request, state) {
|
|
347
363
|
const currentSessionId = state.supervisorOwnerSessionId;
|
|
348
|
-
|
|
364
|
+
if (currentSessionId && request.orchestratorSessionId === currentSessionId)
|
|
365
|
+
return true;
|
|
366
|
+
// orchestratorSessionId is Pi's runtime session id, while inherited sessions are known by session file,
|
|
367
|
+
// so an inherited run's ask is matched through the run's recorded owner. This runs inside the poll's
|
|
368
|
+
// timers and watchers, where a throw exits Pi, so an unreadable status counts as not owned.
|
|
369
|
+
if (!state.currentSessionId || inheritedSessionIds(state.currentSessionId).length === 0)
|
|
370
|
+
return false;
|
|
371
|
+
if (!request.runId || request.runId.startsWith(".") || path.basename(request.runId) !== request.runId)
|
|
372
|
+
return false;
|
|
373
|
+
try {
|
|
374
|
+
return ownsRun(state.currentSessionId, readStatus(path.join(ASYNC_DIR, request.runId))?.sessionId);
|
|
375
|
+
}
|
|
376
|
+
catch {
|
|
377
|
+
return false;
|
|
378
|
+
}
|
|
349
379
|
}
|
|
350
380
|
function rememberedForegroundChild(request, state) {
|
|
351
381
|
const run = state.foregroundRuns?.get(request.runId);
|
|
@@ -438,9 +468,12 @@ function refreshPendingRequests(pending, state, onLifecycle, runState) {
|
|
|
438
468
|
cleanupRequestLifecycle(request, lifecycle);
|
|
439
469
|
}
|
|
440
470
|
}
|
|
471
|
+
function pendingHeader(request) {
|
|
472
|
+
return `- ${request.id}: ${request.agent} [${request.runId}#${request.childIndex}] ${request.reason}.`;
|
|
473
|
+
}
|
|
441
474
|
function formatPendingLine(request) {
|
|
442
475
|
const replyHint = request.expectsReply ? ` Reply: ${supervisorReplyHint(request.id)}` : "";
|
|
443
|
-
const header =
|
|
476
|
+
const header = `${pendingHeader(request)}${replyHint}`;
|
|
444
477
|
// The request notice can be missed; pending is the parent's only way to read the question again.
|
|
445
478
|
return request.message ? `${header}\n ${request.message.replace(/\n/g, "\n ")}` : header;
|
|
446
479
|
}
|
|
@@ -499,13 +532,17 @@ function appendSupervisorReplyEntry(pi, request, reply) {
|
|
|
499
532
|
}
|
|
500
533
|
}
|
|
501
534
|
function resolvePendingRequest(pending, params) {
|
|
535
|
+
const requests = [...pending.values()].filter((request) => request.expectsReply);
|
|
502
536
|
if (params.replyTo) {
|
|
503
537
|
const request = pending.get(params.replyTo);
|
|
504
|
-
if (!request)
|
|
505
|
-
|
|
538
|
+
if (!request) {
|
|
539
|
+
// A child stops waiting after its ask timeout and may ask again under a new id. Its first
|
|
540
|
+
// notice can reach a busy parent after that, so name what can still be answered.
|
|
541
|
+
const current = requests.length ? `Pending now:\n${requests.map(pendingHeader).join("\n")}` : "No pending supervisor requests.";
|
|
542
|
+
throw new Error(`No pending supervisor request found for replyTo '${params.replyTo}'. It was answered, expired or withdrawn. ${current}`);
|
|
543
|
+
}
|
|
506
544
|
return request;
|
|
507
545
|
}
|
|
508
|
-
const requests = [...pending.values()].filter((request) => request.expectsReply);
|
|
509
546
|
if (params.to) {
|
|
510
547
|
const normalizedTo = params.to.toLowerCase();
|
|
511
548
|
const matches = requests.filter((request) => request.id.toLowerCase().startsWith(normalizedTo)
|
|
@@ -579,6 +616,10 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
579
616
|
// One continuation and one warning per request; never auto-answer or loop.
|
|
580
617
|
const settleNotices = new Map();
|
|
581
618
|
let unsubscribeSettle;
|
|
619
|
+
// Asks whose notice Pi queued behind a busy parent run. The child's wait counts from its request,
|
|
620
|
+
// so until the parent's model can see one, its expiresAt keeps moving forward.
|
|
621
|
+
const queuedNotices = new Set();
|
|
622
|
+
let unsubscribeDelivery;
|
|
582
623
|
const requestCorrelations = new Map();
|
|
583
624
|
const correlationKey = (request) => {
|
|
584
625
|
if (!request.toolCallId)
|
|
@@ -613,6 +654,8 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
613
654
|
};
|
|
614
655
|
const observeRequestLifecycle = (request, lifecycle) => {
|
|
615
656
|
settleNotices.delete(request.id);
|
|
657
|
+
if (queuedNotices.delete(request.id))
|
|
658
|
+
updateDeliverySubscription();
|
|
616
659
|
if (lifecycle !== "wrong-session")
|
|
617
660
|
rememberResolvedRequest(request);
|
|
618
661
|
updateSettleSubscription();
|
|
@@ -673,6 +716,16 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
673
716
|
if (!hasTool(pi, NATIVE_SUPERVISOR_TOOL_NAME))
|
|
674
717
|
pi.registerTool(buildParentSupervisorTool(pi, pending, state, observeRequestLifecycle, () => poll(), runState));
|
|
675
718
|
};
|
|
719
|
+
// A session that never delegated through `subagent` does not declare the reply tool (scheduled runs, runs
|
|
720
|
+
// adopted after a resume), so declare it before the model is asked to use it.
|
|
721
|
+
const declareParentTool = () => {
|
|
722
|
+
if (typeof pi.getActiveTools !== "function" || typeof pi.setActiveTools !== "function")
|
|
723
|
+
return;
|
|
724
|
+
const active = pi.getActiveTools();
|
|
725
|
+
if (!Array.isArray(active) || active.includes(NATIVE_SUPERVISOR_TOOL_NAME) || !hasTool(pi, NATIVE_SUPERVISOR_TOOL_NAME))
|
|
726
|
+
return;
|
|
727
|
+
pi.setActiveTools([...active, NATIVE_SUPERVISOR_TOOL_NAME]);
|
|
728
|
+
};
|
|
676
729
|
const cleanupStaleChannelsIfDue = () => {
|
|
677
730
|
if (deps.getChannelDirs)
|
|
678
731
|
return; // The root owns global retention cleanup.
|
|
@@ -691,6 +744,8 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
691
744
|
cleanupStaleChannelsIfDue();
|
|
692
745
|
// Only display notifications require a live UI context, not request registration.
|
|
693
746
|
refreshPendingRequests(pending, state, observeRequestLifecycle, runState);
|
|
747
|
+
if (queuedNotices.size)
|
|
748
|
+
extendQueuedNotices();
|
|
694
749
|
const now = Date.now();
|
|
695
750
|
const channels = deps.getChannelDirs?.();
|
|
696
751
|
for (const { channelDir, file } of listRequestFiles(channels?.dirs, platform)) {
|
|
@@ -715,12 +770,13 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
715
770
|
}
|
|
716
771
|
rememberPendingRequest(request);
|
|
717
772
|
pending.set(request.id, request);
|
|
773
|
+
declareParentTool();
|
|
718
774
|
updateSettleSubscription();
|
|
719
775
|
markForegroundSupervisorAttention(request, state);
|
|
720
776
|
// The ask is already queued above. A sendMessage failure (no UI, stale context) must not
|
|
721
777
|
// lose it, and must not abort the loop before the remaining asks register.
|
|
722
778
|
try {
|
|
723
|
-
(deps.parentWake ?? pi).sendMessage({
|
|
779
|
+
const appended = (deps.parentWake ?? pi).sendMessage({
|
|
724
780
|
customType: SUPERVISOR_REQUEST_MESSAGE_TYPE,
|
|
725
781
|
content: requestVisibleText(request),
|
|
726
782
|
display: true,
|
|
@@ -738,6 +794,11 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
738
794
|
replyHint: supervisorReplyHint(request.id),
|
|
739
795
|
},
|
|
740
796
|
}, { triggerTurn: true });
|
|
797
|
+
// parentWake returns false when Pi steered the notice into a busy run: the model sees it only at its next turn.
|
|
798
|
+
if (appended === false && started && pending.has(request.id)) {
|
|
799
|
+
queuedNotices.add(request.id);
|
|
800
|
+
updateDeliverySubscription();
|
|
801
|
+
}
|
|
741
802
|
}
|
|
742
803
|
catch (error) {
|
|
743
804
|
console.error(`Failed to surface supervisor request ${request.id} as a user turn:`, error);
|
|
@@ -778,6 +839,7 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
778
839
|
updateSettleSubscription();
|
|
779
840
|
if (!requests.length)
|
|
780
841
|
return;
|
|
842
|
+
declareParentTool();
|
|
781
843
|
const unanswered = requests.filter(request => !settleNotices.has(request.id));
|
|
782
844
|
if (unanswered.length) {
|
|
783
845
|
for (const request of unanswered)
|
|
@@ -819,6 +881,50 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
819
881
|
unsubscribeSettle = undefined;
|
|
820
882
|
}
|
|
821
883
|
};
|
|
884
|
+
const noticeDelivered = (event) => {
|
|
885
|
+
const message = event.message;
|
|
886
|
+
if (message.role !== "custom" || message.customType !== SUPERVISOR_REQUEST_MESSAGE_TYPE)
|
|
887
|
+
return;
|
|
888
|
+
const requestId = message.details?.requestId;
|
|
889
|
+
if (typeof requestId === "string" && queuedNotices.delete(requestId))
|
|
890
|
+
updateDeliverySubscription();
|
|
891
|
+
};
|
|
892
|
+
const parentRunSettled = () => {
|
|
893
|
+
// Pi delivers steered messages before a run settles; one still queued was dropped, so stop extending it.
|
|
894
|
+
queuedNotices.clear();
|
|
895
|
+
updateDeliverySubscription();
|
|
896
|
+
};
|
|
897
|
+
const updateDeliverySubscription = () => {
|
|
898
|
+
const needed = started && queuedNotices.size > 0;
|
|
899
|
+
if (needed && !unsubscribeDelivery) {
|
|
900
|
+
unsubscribeDelivery = [pi.on?.("message_start", noticeDelivered), pi.on?.("agent_settled", parentRunSettled)];
|
|
901
|
+
}
|
|
902
|
+
if (!needed) {
|
|
903
|
+
for (const unsubscribe of unsubscribeDelivery ?? [])
|
|
904
|
+
unsubscribe?.();
|
|
905
|
+
unsubscribeDelivery = undefined;
|
|
906
|
+
}
|
|
907
|
+
};
|
|
908
|
+
const extendQueuedNotices = () => {
|
|
909
|
+
const now = Date.now();
|
|
910
|
+
const timeoutMs = askTimeoutMs();
|
|
911
|
+
for (const id of queuedNotices) {
|
|
912
|
+
const request = pending.get(id);
|
|
913
|
+
// Renew at half time only: the rewrite fires this channel's request watcher, which polls again.
|
|
914
|
+
if (!request || requestExpiresAt(request, now) - now > timeoutMs / 2 || !fs.existsSync(request.requestFile))
|
|
915
|
+
continue;
|
|
916
|
+
const { channelDir: _channelDir, requestFile, ...stored } = request;
|
|
917
|
+
try {
|
|
918
|
+
writePrivateAtomicJson(requestFile, { ...stored, expiresAt: now + timeoutMs });
|
|
919
|
+
request.expiresAt = now + timeoutMs;
|
|
920
|
+
}
|
|
921
|
+
catch (error) {
|
|
922
|
+
queuedNotices.delete(id);
|
|
923
|
+
updateDeliverySubscription();
|
|
924
|
+
console.error(`Failed to extend supervisor request ${id} while its notice is queued; it keeps its current deadline:`, error);
|
|
925
|
+
}
|
|
926
|
+
}
|
|
927
|
+
};
|
|
822
928
|
const startPolling = () => {
|
|
823
929
|
if (poller)
|
|
824
930
|
return;
|
|
@@ -957,6 +1063,8 @@ export function createNativeSupervisorChannel(pi, state, deps = {}) {
|
|
|
957
1063
|
dispose: () => {
|
|
958
1064
|
started = false;
|
|
959
1065
|
updateSettleSubscription();
|
|
1066
|
+
queuedNotices.clear();
|
|
1067
|
+
updateDeliverySubscription();
|
|
960
1068
|
try {
|
|
961
1069
|
rootWatcher?.close();
|
|
962
1070
|
}
|