@stigmer/cli 3.1.7 → 3.1.8
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/commands/share.d.ts +3 -0
- package/commands/share.d.ts.map +1 -0
- package/commands/share.js +75 -0
- package/commands/share.js.map +1 -0
- package/config/index.d.ts +1 -1
- package/config/index.d.ts.map +1 -1
- package/config/index.js +1 -1
- package/config/index.js.map +1 -1
- package/config/resolve.d.ts +19 -2
- package/config/resolve.d.ts.map +1 -1
- package/config/resolve.js +40 -2
- package/config/resolve.js.map +1 -1
- package/local/runtime/node.d.ts +9 -2
- package/local/runtime/node.d.ts.map +1 -1
- package/local/runtime/node.js +38 -23
- package/local/runtime/node.js.map +1 -1
- package/package.json +6 -6
- package/program.d.ts.map +1 -1
- package/program.js +2 -0
- package/program.js.map +1 -1
- package/resources/connect/oauth.d.ts +0 -9
- package/resources/connect/oauth.d.ts.map +1 -1
- package/resources/connect/oauth.js +1 -17
- package/resources/connect/oauth.js.map +1 -1
- package/resources/share.d.ts +37 -0
- package/resources/share.d.ts.map +1 -0
- package/resources/share.js +144 -0
- package/resources/share.js.map +1 -0
- package/resources/stream/convert.d.ts +6 -2
- package/resources/stream/convert.d.ts.map +1 -1
- package/resources/stream/convert.js +8 -2
- package/resources/stream/convert.js.map +1 -1
- package/resources/stream/events.d.ts +14 -2
- package/resources/stream/events.d.ts.map +1 -1
- package/resources/stream/events.js.map +1 -1
- package/resources/stream/render-ndjson.js +2 -0
- package/resources/stream/render-ndjson.js.map +1 -1
- package/resources/stream/render-plaintext.d.ts.map +1 -1
- package/resources/stream/render-plaintext.js +3 -0
- package/resources/stream/render-plaintext.js.map +1 -1
- package/resources/stream/snapshot.js +6 -1
- package/resources/stream/snapshot.js.map +1 -1
- package/resources/stream/tool-state.d.ts +1 -1
- package/resources/stream/tool-state.d.ts.map +1 -1
- package/resources/stream/tool-state.js +13 -4
- package/resources/stream/tool-state.js.map +1 -1
- package/src/commands/connect.test.ts +26 -4
- package/src/commands/share.ts +99 -0
- package/src/config/index.ts +2 -0
- package/src/config/resolve.test.ts +38 -0
- package/src/config/resolve.ts +42 -3
- package/src/local/runtime/node.ts +43 -25
- package/src/local/runtime/runtime.test.ts +5 -4
- package/src/program.test.ts +7 -0
- package/src/program.ts +2 -0
- package/src/resources/connect/oauth.test.ts +1 -24
- package/src/resources/connect/oauth.ts +1 -17
- package/src/resources/read-verbs.integration.test.ts +1 -1
- package/src/resources/share.test.ts +389 -0
- package/src/resources/share.ts +227 -0
- package/src/resources/stream/convert.ts +17 -3
- package/src/resources/stream/diff.test.ts +22 -0
- package/src/resources/stream/events.ts +15 -1
- package/src/resources/stream/render-ndjson.test.ts +10 -0
- package/src/resources/stream/render-ndjson.ts +2 -0
- package/src/resources/stream/render-plaintext.test.ts +8 -0
- package/src/resources/stream/render-plaintext.ts +3 -0
- package/src/resources/stream/snapshot.test.ts +14 -0
- package/src/resources/stream/snapshot.ts +5 -1
- package/src/resources/stream/tool-state.ts +13 -4
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
// `share agent` dispatch: enable or disable public sharing for an agent and
|
|
2
|
+
// report the hosted chat link + embed snippet.
|
|
3
|
+
//
|
|
4
|
+
// The one correctness invariant here: the `updateSharing` RPC replaces
|
|
5
|
+
// `spec.sharing` WHOLESALE. A naive "set enabled" would silently wipe any
|
|
6
|
+
// `allowed_origins` or visitor messages the owner configured in the console.
|
|
7
|
+
// So this module always reads the current state first and sends the complete
|
|
8
|
+
// block back with only `enabled` flipped — the same merge-preserve discipline
|
|
9
|
+
// as the web dialog's draftFromAgent (sdk/react ShareAgentDialog.tsx).
|
|
10
|
+
//
|
|
11
|
+
// URL and snippet shapes come from @stigmer/sdk's sharing helpers — the single
|
|
12
|
+
// source of truth shared with the web console — so every surface emits
|
|
13
|
+
// byte-identical output. The caller supplies the app origin (resolved from the
|
|
14
|
+
// backend type by the command layer) to keep this module pure and env-free.
|
|
15
|
+
import { create } from "@bufbuild/protobuf";
|
|
16
|
+
import { RotateShareLinkInputSchema, UpdateAgentSharingInputSchema, } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/io_pb";
|
|
17
|
+
import { AgentSharingAudience, AgentSharingMessagesSchema, AgentSharingSchema, } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/spec_pb";
|
|
18
|
+
import { buildChatUrl, buildEmbedSnippet } from "@stigmer/sdk";
|
|
19
|
+
import { UsageError } from "../errors/index.js";
|
|
20
|
+
import { CommandResult } from "../output/index.js";
|
|
21
|
+
import { isAgentId } from "./reference.js";
|
|
22
|
+
import { resolveAgentRef } from "./run/resolve.js";
|
|
23
|
+
/**
|
|
24
|
+
* Enable or disable sharing for the referenced agent and describe the
|
|
25
|
+
* outcome. Idempotent: when the agent is already in the desired state, no
|
|
26
|
+
* write is issued (the link is still reported when sharing is on).
|
|
27
|
+
*/
|
|
28
|
+
export async function shareAgent(client, ref, org, options) {
|
|
29
|
+
// Fail fast with actionable guidance instead of the backend's cryptic
|
|
30
|
+
// "org value length must be at least 1" — mirrors the connect org guard.
|
|
31
|
+
if (org === "" && !isAgentId(ref) && !ref.includes("/")) {
|
|
32
|
+
throw new UsageError("organization not set\n\n" +
|
|
33
|
+
"Set it with:\n" +
|
|
34
|
+
" stigmer config context set --org <org>\n" +
|
|
35
|
+
` stigmer share agent ${ref} --org <org>`);
|
|
36
|
+
}
|
|
37
|
+
const agent = await resolveAgentRef(client, ref, org);
|
|
38
|
+
const current = agent.spec?.sharing;
|
|
39
|
+
const currentAudience = audienceFromProto(current?.audience);
|
|
40
|
+
const targetAudience = options.audience ?? currentAudience;
|
|
41
|
+
// Resetting the link is meaningless for org-members-only shares: their
|
|
42
|
+
// access is gated by live membership, and the member link never carries
|
|
43
|
+
// the token. Refuse rather than silently rotating an unused secret —
|
|
44
|
+
// the share dialog hides its Reset control for org audience for the
|
|
45
|
+
// same reason.
|
|
46
|
+
if (options.resetLink === true && targetAudience === "org") {
|
|
47
|
+
throw new UsageError("--reset-link only applies to public links\n\n" +
|
|
48
|
+
"This share is restricted to organization members, whose access is\n" +
|
|
49
|
+
"checked on every message. To cut someone off, remove them from the\n" +
|
|
50
|
+
"organization.");
|
|
51
|
+
}
|
|
52
|
+
const alreadyInState = (current?.enabled ?? false) === options.enabled &&
|
|
53
|
+
currentAudience === targetAudience;
|
|
54
|
+
if (!alreadyInState) {
|
|
55
|
+
// Send the COMPLETE sharing block with only the requested fields changed,
|
|
56
|
+
// so a CLI toggle can never wipe console-configured origins, visitor
|
|
57
|
+
// messages, or an org-members-only audience.
|
|
58
|
+
await client.agent.updateSharing(create(UpdateAgentSharingInputSchema, {
|
|
59
|
+
resourceId: agent.metadata?.id ?? "",
|
|
60
|
+
sharing: preservingSharing(current, options.enabled, targetAudience),
|
|
61
|
+
}));
|
|
62
|
+
}
|
|
63
|
+
// The rotation is a separate targeted RPC (the token is server-owned
|
|
64
|
+
// status, not part of the sharing block). The returned agent carries the
|
|
65
|
+
// fresh token, so the link printed below is the new one.
|
|
66
|
+
let linkToken = agent.status?.shareLinkToken ?? "";
|
|
67
|
+
if (options.resetLink === true) {
|
|
68
|
+
const rotated = await client.agent.rotateShareLink(create(RotateShareLinkInputSchema, {
|
|
69
|
+
resourceId: agent.metadata?.id ?? "",
|
|
70
|
+
}));
|
|
71
|
+
linkToken = rotated.status?.shareLinkToken ?? "";
|
|
72
|
+
}
|
|
73
|
+
return describeOutcome(agent, options, targetAudience, linkToken, alreadyInState && options.resetLink !== true);
|
|
74
|
+
}
|
|
75
|
+
// Unspecified means public by contract (pre-audience shares keep their
|
|
76
|
+
// anyone-with-link behavior).
|
|
77
|
+
function audienceFromProto(audience) {
|
|
78
|
+
return audience === AgentSharingAudience.org ? "org" : "public";
|
|
79
|
+
}
|
|
80
|
+
// The full sharing config with the desired `enabled` and audience,
|
|
81
|
+
// preserving origins and messages (empty defaults when the agent was never
|
|
82
|
+
// shared before). The audience is written explicitly — never left
|
|
83
|
+
// unspecified — so a console-managed org share can't drift back to public.
|
|
84
|
+
function preservingSharing(current, enabled, audience) {
|
|
85
|
+
return create(AgentSharingSchema, {
|
|
86
|
+
enabled,
|
|
87
|
+
audience: audience === "org"
|
|
88
|
+
? AgentSharingAudience.org
|
|
89
|
+
: AgentSharingAudience.public,
|
|
90
|
+
allowedOrigins: [...(current?.allowedOrigins ?? [])],
|
|
91
|
+
messages: create(AgentSharingMessagesSchema, {
|
|
92
|
+
rateLimited: current?.messages?.rateLimited ?? "",
|
|
93
|
+
unavailable: current?.messages?.unavailable ?? "",
|
|
94
|
+
conversationEnded: current?.messages?.conversationEnded ?? "",
|
|
95
|
+
}),
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
// Build the user-facing result. Org/slug come from the RESOLVED agent's
|
|
99
|
+
// metadata (authoritative even when the user passed an ID), matching how the
|
|
100
|
+
// web share dialog derives them. The link token comes from the agent's
|
|
101
|
+
// status (post-rotation when --reset-link ran) and rides the printed URL
|
|
102
|
+
// and snippet — public audience only (org access is gated by membership).
|
|
103
|
+
function describeOutcome(agent, options, audience, linkToken, alreadyInState) {
|
|
104
|
+
const org = agent.metadata?.org ?? "";
|
|
105
|
+
const slug = agent.metadata?.slug ?? "";
|
|
106
|
+
const name = agent.metadata?.name || slug;
|
|
107
|
+
if (!options.enabled) {
|
|
108
|
+
const result = CommandResult.success(alreadyInState ? `Sharing is already off for '${name}'` : `Sharing disabled for '${name}'`);
|
|
109
|
+
result.hint("The share link no longer works. Re-enable with:");
|
|
110
|
+
result.hint(` stigmer share agent ${org}/${slug}`);
|
|
111
|
+
return result;
|
|
112
|
+
}
|
|
113
|
+
const result = CommandResult.success(options.resetLink === true
|
|
114
|
+
? `Share link reset for '${name}' — the old link no longer works`
|
|
115
|
+
: alreadyInState
|
|
116
|
+
? `Sharing is already on for '${name}'`
|
|
117
|
+
: `Sharing enabled for '${name}'`);
|
|
118
|
+
const publicLinkToken = audience === "org" ? undefined : linkToken || undefined;
|
|
119
|
+
result
|
|
120
|
+
.addSection(audience === "org" ? "Member chat link" : "Public chat link")
|
|
121
|
+
.item(buildChatUrl(options.appOrigin, org, slug, publicLinkToken));
|
|
122
|
+
if (audience === "org") {
|
|
123
|
+
// Embeds serve anonymous guests, which org-members-only shares refuse
|
|
124
|
+
// by design — no snippet to print.
|
|
125
|
+
result.hint(`Only signed-in members of ${org} can chat. Access ends when they leave the organization.`);
|
|
126
|
+
result.hint(`Members chat on ${org}'s credits.`);
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
const snippetSection = result.addSection("Embed on your site");
|
|
130
|
+
for (const line of buildEmbedSnippet(options.appOrigin, org, slug, publicLinkToken).split("\n")) {
|
|
131
|
+
snippetSection.item(line);
|
|
132
|
+
}
|
|
133
|
+
result.hint(`Visitors chat on ${org}'s credits.`);
|
|
134
|
+
result.hint("Public links can be forwarded and indexed by search engines.");
|
|
135
|
+
if (options.resetLink === true) {
|
|
136
|
+
result.hint("Re-share the new link with the people who should keep access.");
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
if (options.isLocal) {
|
|
140
|
+
result.hint("Guest chat is a Stigmer Cloud capability — this local link won't serve visitors.");
|
|
141
|
+
}
|
|
142
|
+
return result;
|
|
143
|
+
}
|
|
144
|
+
//# sourceMappingURL=share.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"share.js","sourceRoot":"","sources":["../../src/resources/share.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { TodoItem } from "@stigmer/protos/ai/stigmer/agentic/agentexecution
|
|
|
4
4
|
import { ExecutionPhase, SubAgentStatus, SummarizationSource, ToolCallStatus, TodoStatus } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/enum_pb";
|
|
5
5
|
import type { ToolCallInfo, TodoItemView } from "./events.js";
|
|
6
6
|
/** Mapped tool-call status strings. */
|
|
7
|
-
export type ToolStatus = "pending" | "running" | "completed" | "failed" | "waiting_approval" | "skipped" | "unknown";
|
|
7
|
+
export type ToolStatus = "pending" | "running" | "completed" | "failed" | "waiting_approval" | "skipped" | "interrupted" | "unknown";
|
|
8
8
|
/** Convert a proto ToolCall to render info. Mirrors Go's convertToolCall. */
|
|
9
9
|
export declare function convertToolCall(tc: ToolCall): ToolCallInfo;
|
|
10
10
|
/** Convert a slice of proto ToolCalls. Mirrors Go's convertToolCalls. */
|
|
@@ -25,7 +25,11 @@ export declare function mapTodoStatus(status: TodoStatus): string;
|
|
|
25
25
|
export declare function mapSummarizationSource(source: SummarizationSource): string;
|
|
26
26
|
/** The protojson enum name for a sub-agent status (matches Go's status.String()). */
|
|
27
27
|
export declare function subAgentStatusName(status: SubAgentStatus): string;
|
|
28
|
-
/**
|
|
28
|
+
/**
|
|
29
|
+
* True for tool statuses that mean the tool is no longer executing.
|
|
30
|
+
* "interrupted" (platform-settled at terminalization, issue #207) is terminal:
|
|
31
|
+
* without it, a settled call replays as a live running block forever.
|
|
32
|
+
*/
|
|
29
33
|
export declare function isTerminalToolStatus(status: string): boolean;
|
|
30
34
|
/** True for terminal agent phases. Mirrors Go's isTerminalAgentPhase. */
|
|
31
35
|
export declare function isTerminalAgentPhase(phase: ExecutionPhase): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../src/resources/stream/convert.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iEAAiE,CAAC;AAC9G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kEAAkE,CAAC;AAC1G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8DAA8D,CAAC;AAC7F,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,cAAc,EACd,UAAU,EACX,MAAM,8DAA8D,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE9D,uCAAuC;AACvC,MAAM,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../src/resources/stream/convert.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,iEAAiE,CAAC;AAC9G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kEAAkE,CAAC;AAC1G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8DAA8D,CAAC;AAC7F,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,cAAc,EACd,UAAU,EACX,MAAM,8DAA8D,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE9D,uCAAuC;AACvC,MAAM,MAAM,UAAU,GAClB,SAAS,GACT,SAAS,GACT,WAAW,GACX,QAAQ,GACR,kBAAkB,GAClB,SAAS,GACT,aAAa,GACb,SAAS,CAAC;AAEd,6EAA6E;AAC7E,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,GAAG,YAAY,CAU1D;AAED,yEAAyE;AACzE,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,GAAG,YAAY,EAAE,CAE/E;AAED,qGAAqG;AACrG,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,GAAG,QAAQ,EAAE,CAI1F;AAED,qGAAqG;AACrG,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,QAAQ,EAAE,EAC9B,SAAS,EAAE,SAAS,iBAAiB,EAAE,EACvC,EAAE,EAAE,MAAM,GACT,QAAQ,GAAG,SAAS,CAYtB;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,YAAY,EAAE,CAMjF;AAED,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAmB9D;AAED,iFAAiF;AACjF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAmBpE;AAED,+FAA+F;AAC/F,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAaxD;AAED,2FAA2F;AAC3F,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAS1E;AAED,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,yEAAyE;AACzE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAOnE;AAED,mFAAmF;AACnF,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAMxE;AAMD,4FAA4F;AAC5F,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAS7D;AAED,yHAAyH;AACzH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE/D"}
|
|
@@ -88,6 +88,8 @@ export function mapToolCallStatus(status) {
|
|
|
88
88
|
return "waiting_approval";
|
|
89
89
|
case ToolCallStatus.TOOL_CALL_SKIPPED:
|
|
90
90
|
return "skipped";
|
|
91
|
+
case ToolCallStatus.TOOL_CALL_INTERRUPTED:
|
|
92
|
+
return "interrupted";
|
|
91
93
|
default:
|
|
92
94
|
return "unknown";
|
|
93
95
|
}
|
|
@@ -122,9 +124,13 @@ export function mapSummarizationSource(source) {
|
|
|
122
124
|
export function subAgentStatusName(status) {
|
|
123
125
|
return SubAgentStatus[status] ?? "SUB_AGENT_STATUS_UNSPECIFIED";
|
|
124
126
|
}
|
|
125
|
-
/**
|
|
127
|
+
/**
|
|
128
|
+
* True for tool statuses that mean the tool is no longer executing.
|
|
129
|
+
* "interrupted" (platform-settled at terminalization, issue #207) is terminal:
|
|
130
|
+
* without it, a settled call replays as a live running block forever.
|
|
131
|
+
*/
|
|
126
132
|
export function isTerminalToolStatus(status) {
|
|
127
|
-
return status === "completed" || status === "failed" || status === "skipped";
|
|
133
|
+
return status === "completed" || status === "failed" || status === "skipped" || status === "interrupted";
|
|
128
134
|
}
|
|
129
135
|
/** True for terminal agent phases. Mirrors Go's isTerminalAgentPhase. */
|
|
130
136
|
export function isTerminalAgentPhase(phase) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../src/resources/stream/convert.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,EAAE;AACF,8EAA8E;AAC9E,4EAA4E;AAC5E,gFAAgF;AAChF,gDAAgD;AAKhD,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,cAAc,EACd,UAAU,GACX,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../src/resources/stream/convert.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { JsonObject } from "@bufbuild/protobuf";
|
|
|
3
3
|
export interface ToolCallInfo {
|
|
4
4
|
readonly id: string;
|
|
5
5
|
readonly name: string;
|
|
6
|
-
/** Mapped status: pending|running|completed|failed|waiting_approval|skipped|unknown. */
|
|
6
|
+
/** Mapped status: pending|running|completed|failed|waiting_approval|skipped|interrupted|unknown. */
|
|
7
7
|
readonly status: string;
|
|
8
8
|
readonly args?: JsonObject;
|
|
9
9
|
readonly result: string;
|
|
@@ -61,6 +61,18 @@ export interface ToolCompletedEvent {
|
|
|
61
61
|
readonly toolCall: ToolCallInfo;
|
|
62
62
|
readonly subAgentId: string;
|
|
63
63
|
}
|
|
64
|
+
/**
|
|
65
|
+
* A tool call the platform settled to INTERRUPTED because its execution
|
|
66
|
+
* terminalized mid-call (issue #207). A distinct terminal event — routing it
|
|
67
|
+
* through toolCompleted would print a dishonest checkmark for a tool that
|
|
68
|
+
* never finished.
|
|
69
|
+
*/
|
|
70
|
+
export interface ToolInterruptedEvent {
|
|
71
|
+
readonly kind: "toolInterrupted";
|
|
72
|
+
readonly toolCallId: string;
|
|
73
|
+
readonly toolCall: ToolCallInfo;
|
|
74
|
+
readonly subAgentId: string;
|
|
75
|
+
}
|
|
64
76
|
export interface ToolWaitingApprovalEvent {
|
|
65
77
|
readonly kind: "toolWaitingApproval";
|
|
66
78
|
readonly toolCallId: string;
|
|
@@ -131,7 +143,7 @@ export interface StreamErrorEvent {
|
|
|
131
143
|
readonly error: string;
|
|
132
144
|
}
|
|
133
145
|
/** The sealed union of every differ event. */
|
|
134
|
-
export type StreamEvent = AIMessageEvent | AIStreamStartEvent | AIStreamDeltaEvent | AIStreamEndEvent | HumanMessageEvent | ToolResultEvent | ToolRunningEvent | ToolCompletedEvent | ToolWaitingApprovalEvent | ToolStreamDeltaEvent | SystemMessageEvent | PhaseChangeEvent | ApprovalNeededEvent | TodoUpdateEvent | ContextCompactedEvent | SubAgentStartedEvent | SubAgentCompletedEvent | DoneEvent | StreamErrorEvent;
|
|
146
|
+
export type StreamEvent = AIMessageEvent | AIStreamStartEvent | AIStreamDeltaEvent | AIStreamEndEvent | HumanMessageEvent | ToolResultEvent | ToolRunningEvent | ToolCompletedEvent | ToolInterruptedEvent | ToolWaitingApprovalEvent | ToolStreamDeltaEvent | SystemMessageEvent | PhaseChangeEvent | ApprovalNeededEvent | TodoUpdateEvent | ContextCompactedEvent | SubAgentStartedEvent | SubAgentCompletedEvent | DoneEvent | StreamErrorEvent;
|
|
135
147
|
/** True for the two events that end a stream. */
|
|
136
148
|
export declare function isTerminalEvent(event: StreamEvent): boolean;
|
|
137
149
|
//# sourceMappingURL=events.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/resources/stream/events.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/resources/stream/events.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/resources/stream/events.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,EAAE;AACF,8EAA8E;AAC9E,6EAA6E;AAC7E,6EAA6E;AAC7E,kEAAkE;AAClE,EAAE;AACF,+EAA+E;AAC/E,gFAAgF;AAChF,4CAA4C;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/resources/stream/events.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,EAAE;AACF,8EAA8E;AAC9E,6EAA6E;AAC7E,6EAA6E;AAC7E,kEAAkE;AAClE,EAAE;AACF,+EAA+E;AAC/E,gFAAgF;AAChF,4CAA4C;AAkM5C,iDAAiD;AACjD,MAAM,UAAU,eAAe,CAAC,KAAkB;IAChD,OAAO,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,CAAC;AAC/D,CAAC"}
|
|
@@ -52,6 +52,8 @@ function mapToNdjson(event) {
|
|
|
52
52
|
return { type: "tool_running", payload: toolEventPayload(event.toolCallId, event.toolCall, event.subAgentId) };
|
|
53
53
|
case "toolCompleted":
|
|
54
54
|
return { type: "tool_completed", payload: toolEventPayload(event.toolCallId, event.toolCall, event.subAgentId) };
|
|
55
|
+
case "toolInterrupted":
|
|
56
|
+
return { type: "tool_interrupted", payload: toolEventPayload(event.toolCallId, event.toolCall, event.subAgentId) };
|
|
55
57
|
case "toolWaitingApproval":
|
|
56
58
|
return {
|
|
57
59
|
type: "tool_waiting_approval",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-ndjson.js","sourceRoot":"","sources":["../../../src/resources/stream/render-ndjson.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"render-ndjson.js","sourceRoot":"","sources":["../../../src/resources/stream/render-ndjson.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-plaintext.d.ts","sourceRoot":"","sources":["../../../src/resources/stream/render-plaintext.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAC9F,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACvC,+BAA+B;IAC/B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,6CAA6C;IAC7C,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC7B;AAID,wEAAwE;AACxE,qBAAa,iBAAkB,YAAW,gBAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,wBAAwB;IAE3D,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"render-plaintext.d.ts","sourceRoot":"","sources":["../../../src/resources/stream/render-plaintext.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAC9F,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACvC,+BAA+B;IAC/B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,6CAA6C;IAC7C,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAC7B;AAID,wEAAwE;AACxE,qBAAa,iBAAkB,YAAW,gBAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,wBAAwB;IAE3D,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAqDhC,eAAe,CAAC,MAAM,EAAE,mBAAmB,GAAG,cAAc;CAG7D"}
|
|
@@ -37,6 +37,9 @@ export class PlaintextRenderer {
|
|
|
37
37
|
? ` ✗ ${event.toolCall.name}: ${truncate(event.toolCall.error, MAX_ERROR_LEN)}\n`
|
|
38
38
|
: ` ✓ ${event.toolCall.name}\n`);
|
|
39
39
|
return;
|
|
40
|
+
case "toolInterrupted":
|
|
41
|
+
status.write(` ⊘ ${event.toolCall.name} (interrupted)\n`);
|
|
42
|
+
return;
|
|
40
43
|
case "approvalNeeded":
|
|
41
44
|
status.write(` ⚠ Approval needed: ${event.toolName} (auto-skipped in non-TTY mode)\n`);
|
|
42
45
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-plaintext.js","sourceRoot":"","sources":["../../../src/resources/stream/render-plaintext.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"render-plaintext.js","sourceRoot":"","sources":["../../../src/resources/stream/render-plaintext.ts"],"names":[],"mappings":"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"}
|
|
@@ -126,7 +126,12 @@ function emitOtherMessage(out, msg) {
|
|
|
126
126
|
function emitToolByStatus(out, tc) {
|
|
127
127
|
const status = mapToolCallStatus(tc.status);
|
|
128
128
|
const toolCall = convertToolCall(tc);
|
|
129
|
-
if (
|
|
129
|
+
if (status === "interrupted") {
|
|
130
|
+
// Terminal but never "completed": replaying a platform-interrupted call as
|
|
131
|
+
// either a checkmark or a live running block would lie (issue #207).
|
|
132
|
+
out.push({ kind: "toolInterrupted", toolCallId: tc.id, toolCall, subAgentId: "" });
|
|
133
|
+
}
|
|
134
|
+
else if (isTerminalToolStatus(status)) {
|
|
130
135
|
out.push({ kind: "toolCompleted", toolCallId: tc.id, toolCall, subAgentId: "" });
|
|
131
136
|
}
|
|
132
137
|
else if (status === "waiting_approval") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/resources/stream/snapshot.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/resources/stream/snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export declare class ToolStateTracker {
|
|
|
22
22
|
has(id: string): boolean;
|
|
23
23
|
private running;
|
|
24
24
|
private waiting;
|
|
25
|
-
private
|
|
25
|
+
private terminal;
|
|
26
26
|
}
|
|
27
27
|
/** The tool-call ID carried by a tool-lifecycle event, or "" otherwise. Mirrors Go's toolEventID. */
|
|
28
28
|
export declare function toolEventId(event: StreamEvent): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-state.d.ts","sourceRoot":"","sources":["../../../src/resources/stream/tool-state.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iEAAiE,CAAC;AAEhG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;GAIG;AACH,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IAEpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IAErD;;;;OAIG;IACH,KAAK,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,WAAW,EAAE;IAqExE;;;;OAIG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAIxB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"tool-state.d.ts","sourceRoot":"","sources":["../../../src/resources/stream/tool-state.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iEAAiE,CAAC;AAEhG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;GAIG;AACH,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IAEpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IAErD;;;;OAIG;IACH,KAAK,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,WAAW,EAAE;IAqExE;;;;OAIG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAIxB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,QAAQ;CAQjB;AAED,qGAAqG;AACrG,wBAAgB,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAWtD;AAED,wGAAwG;AACxG,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAO1F"}
|
|
@@ -46,13 +46,13 @@ export class ToolStateTracker {
|
|
|
46
46
|
// First sight, already terminal (e.g. re-attach): synthesize completion so
|
|
47
47
|
// the block exists — otherwise its MESSAGE_TOOL is suppressed and it vanishes.
|
|
48
48
|
if (!seen && isTerminalToolStatus(current)) {
|
|
49
|
-
pending.push(this.
|
|
49
|
+
pending.push(this.terminal(tc, current, subAgentId));
|
|
50
50
|
this.states.set(tc.id, current);
|
|
51
51
|
continue;
|
|
52
52
|
}
|
|
53
53
|
// running/waiting -> terminal: close the block.
|
|
54
54
|
if (seen && (prev === "running" || prev === "waiting_approval") && isTerminalToolStatus(current)) {
|
|
55
|
-
pending.push(this.
|
|
55
|
+
pending.push(this.terminal(tc, current, subAgentId));
|
|
56
56
|
this.states.set(tc.id, current);
|
|
57
57
|
this.results.delete(tc.id);
|
|
58
58
|
continue;
|
|
@@ -97,8 +97,16 @@ export class ToolStateTracker {
|
|
|
97
97
|
waiting(tc, subAgentId) {
|
|
98
98
|
return { kind: "toolWaitingApproval", toolCallId: tc.id, toolCall: convertToolCall(tc), subAgentId };
|
|
99
99
|
}
|
|
100
|
-
|
|
101
|
-
|
|
100
|
+
// The terminal-close event for a settled status: interrupted gets its own
|
|
101
|
+
// kind (issue #207) so renderers never print a checkmark for a tool the
|
|
102
|
+
// platform cut short; every other terminal status closes as completed.
|
|
103
|
+
terminal(tc, status, subAgentId) {
|
|
104
|
+
return {
|
|
105
|
+
kind: status === "interrupted" ? "toolInterrupted" : "toolCompleted",
|
|
106
|
+
toolCallId: tc.id,
|
|
107
|
+
toolCall: convertToolCall(tc),
|
|
108
|
+
subAgentId,
|
|
109
|
+
};
|
|
102
110
|
}
|
|
103
111
|
}
|
|
104
112
|
/** The tool-call ID carried by a tool-lifecycle event, or "" otherwise. Mirrors Go's toolEventID. */
|
|
@@ -106,6 +114,7 @@ export function toolEventId(event) {
|
|
|
106
114
|
switch (event.kind) {
|
|
107
115
|
case "toolRunning":
|
|
108
116
|
case "toolCompleted":
|
|
117
|
+
case "toolInterrupted":
|
|
109
118
|
case "toolWaitingApproval":
|
|
110
119
|
case "toolStreamDelta":
|
|
111
120
|
return event.toolCallId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-state.js","sourceRoot":"","sources":["../../../src/resources/stream/tool-state.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,EAAE;AACF,8EAA8E;AAC9E,8EAA8E;AAC9E,6EAA6E;AAC7E,iFAAiF;AACjF,+EAA+E;AAC/E,+BAA+B;AAG/B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGxF;;;;GAIG;AACH,MAAM,OAAO,gBAAgB;IAC3B,0CAA0C;IACzB,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACpD,0EAA0E;IACzD,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAErD;;;;OAIG;IACH,KAAK,CAAC,SAA8B,EAAE,UAAkB;QACtD,MAAM,OAAO,GAAkB,EAAE,CAAC;QAElC,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC3B,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE;gBAAE,SAAS;YAE3B,MAAM,OAAO,GAAG,iBAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAEpC,sDAAsD;YACtD,IAAI,CAAC,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBACnC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;gBAChC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;gBACnC,SAAS;YACX,CAAC;YAED,wDAAwD;YACxD,IAAI,CAAC,IAAI,IAAI,OAAO,KAAK,kBAAkB,EAAE,CAAC;gBAC5C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;gBAChC,SAAS;YACX,CAAC;YAED,2EAA2E;YAC3E,+EAA+E;YAC/E,IAAI,CAAC,IAAI,IAAI,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"tool-state.js","sourceRoot":"","sources":["../../../src/resources/stream/tool-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,34 @@
|
|
|
6
6
|
// only when it is actually going to push. `--dry-run` discovers locally and must
|
|
7
7
|
// stay usable with no org configured.
|
|
8
8
|
//
|
|
9
|
-
//
|
|
10
|
-
//
|
|
11
|
-
//
|
|
9
|
+
// Local mode always resolves an org (the single-tenant DEFAULT_LOCAL_ORG
|
|
10
|
+
// fallback in resolveOrganization), so the guard can only fire in cloud mode
|
|
11
|
+
// with no org selected. The guard test injects that shape by overriding
|
|
12
|
+
// `load()`; everything else stays real. The guard runs before any network
|
|
13
|
+
// call, so both cases are fully deterministic and offline.
|
|
12
14
|
|
|
13
15
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
16
|
+
import type { Config } from "../config/index.js";
|
|
14
17
|
import { classify, ExitCode } from "../errors/index.js";
|
|
15
18
|
import { buildProgram } from "../program.js";
|
|
16
19
|
|
|
20
|
+
// When set, `load()` returns this config instead of reading disk/defaults.
|
|
21
|
+
// Reset in beforeEach so each test opts in explicitly.
|
|
22
|
+
let configOverride: Config | undefined;
|
|
23
|
+
|
|
24
|
+
vi.mock("../config/index.js", async (importOriginal) => {
|
|
25
|
+
const actual = await importOriginal<typeof import("../config/index.js")>();
|
|
26
|
+
return {
|
|
27
|
+
...actual,
|
|
28
|
+
load: (path?: string) => configOverride ?? actual.load(path),
|
|
29
|
+
};
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
/** An authenticated cloud config with no org selected — the guard's target shape. */
|
|
33
|
+
function cloudConfigWithoutOrg(): Config {
|
|
34
|
+
return { backend: { type: "cloud", cloud: { token: "test-token" } } };
|
|
35
|
+
}
|
|
36
|
+
|
|
17
37
|
interface RunOutcome {
|
|
18
38
|
readonly exitCode: number;
|
|
19
39
|
readonly message: string;
|
|
@@ -43,6 +63,7 @@ let savedOrg: string | undefined;
|
|
|
43
63
|
let savedApiKey: string | undefined;
|
|
44
64
|
|
|
45
65
|
beforeEach(() => {
|
|
66
|
+
configOverride = undefined;
|
|
46
67
|
savedOrg = process.env.STIGMER_ORG_ID;
|
|
47
68
|
savedApiKey = process.env.STIGMER_API_KEY;
|
|
48
69
|
delete process.env.STIGMER_ORG_ID;
|
|
@@ -57,7 +78,8 @@ afterEach(() => {
|
|
|
57
78
|
});
|
|
58
79
|
|
|
59
80
|
describe("connect mcp-server org guard", () => {
|
|
60
|
-
it("fails fast with actionable guidance when no org
|
|
81
|
+
it("fails fast with actionable guidance when cloud mode has no org (non-dry-run)", async () => {
|
|
82
|
+
configOverride = cloudConfigWithoutOrg();
|
|
61
83
|
const outcome = await runConnect("mcp_test");
|
|
62
84
|
expect(outcome.message).toContain("organization not set");
|
|
63
85
|
expect(outcome.exitCode).toBe(ExitCode.Usage);
|