@pennixrv/trellis 0.7.1-beta.9 → 0.7.2-beta.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/dist/cli/index.js +4 -4
- package/dist/cli/index.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +39 -26
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/teamwork/adapters/acp.d.ts +20 -0
- package/dist/commands/teamwork/adapters/acp.d.ts.map +1 -0
- package/dist/commands/teamwork/adapters/acp.js +268 -0
- package/dist/commands/teamwork/adapters/acp.js.map +1 -0
- package/dist/commands/teamwork/adapters/claude.d.ts +1 -0
- package/dist/commands/teamwork/adapters/claude.d.ts.map +1 -1
- package/dist/commands/teamwork/adapters/claude.js +5 -0
- package/dist/commands/teamwork/adapters/claude.js.map +1 -1
- package/dist/commands/teamwork/adapters/codex.d.ts +3 -2
- package/dist/commands/teamwork/adapters/codex.d.ts.map +1 -1
- package/dist/commands/teamwork/adapters/codex.js +14 -15
- package/dist/commands/teamwork/adapters/codex.js.map +1 -1
- package/dist/commands/teamwork/adapters/index.d.ts +23 -1
- package/dist/commands/teamwork/adapters/index.d.ts.map +1 -1
- package/dist/commands/teamwork/adapters/index.js +163 -24
- package/dist/commands/teamwork/adapters/index.js.map +1 -1
- package/dist/commands/teamwork/agent-loader.d.ts +2 -1
- package/dist/commands/teamwork/agent-loader.d.ts.map +1 -1
- package/dist/commands/teamwork/agent-loader.js +2 -1
- package/dist/commands/teamwork/agent-loader.js.map +1 -1
- package/dist/commands/teamwork/artifact.d.ts +33 -10
- package/dist/commands/teamwork/artifact.d.ts.map +1 -1
- package/dist/commands/teamwork/artifact.js +182 -50
- package/dist/commands/teamwork/artifact.js.map +1 -1
- package/dist/commands/teamwork/batch-reservation.d.ts +16 -0
- package/dist/commands/teamwork/batch-reservation.d.ts.map +1 -0
- package/dist/commands/teamwork/batch-reservation.js +43 -0
- package/dist/commands/teamwork/batch-reservation.js.map +1 -0
- package/dist/commands/teamwork/batch.d.ts +22 -0
- package/dist/commands/teamwork/batch.d.ts.map +1 -0
- package/dist/commands/teamwork/batch.js +394 -0
- package/dist/commands/teamwork/batch.js.map +1 -0
- package/dist/commands/teamwork/context-loader.d.ts +1 -1
- package/dist/commands/teamwork/context-loader.d.ts.map +1 -1
- package/dist/commands/teamwork/context-loader.js +19 -6
- package/dist/commands/teamwork/context-loader.js.map +1 -1
- package/dist/commands/teamwork/coordination.d.ts +88 -0
- package/dist/commands/teamwork/coordination.d.ts.map +1 -0
- package/dist/commands/teamwork/coordination.js +153 -0
- package/dist/commands/teamwork/coordination.js.map +1 -0
- package/dist/commands/teamwork/coordinator.d.ts +17 -3
- package/dist/commands/teamwork/coordinator.d.ts.map +1 -1
- package/dist/commands/teamwork/coordinator.js +772 -289
- package/dist/commands/teamwork/coordinator.js.map +1 -1
- package/dist/commands/teamwork/create.d.ts +1 -0
- package/dist/commands/teamwork/create.d.ts.map +1 -1
- package/dist/commands/teamwork/create.js +2 -1
- package/dist/commands/teamwork/create.js.map +1 -1
- package/dist/commands/teamwork/dev-parse-trace.d.ts +2 -1
- package/dist/commands/teamwork/dev-parse-trace.d.ts.map +1 -1
- package/dist/commands/teamwork/dev-parse-trace.js +2 -0
- package/dist/commands/teamwork/dev-parse-trace.js.map +1 -1
- package/dist/commands/teamwork/foreground-wait.d.ts +6 -0
- package/dist/commands/teamwork/foreground-wait.d.ts.map +1 -0
- package/dist/commands/teamwork/foreground-wait.js +65 -0
- package/dist/commands/teamwork/foreground-wait.js.map +1 -0
- package/dist/commands/teamwork/guard.d.ts +2 -2
- package/dist/commands/teamwork/guard.d.ts.map +1 -1
- package/dist/commands/teamwork/guard.js +23 -5
- package/dist/commands/teamwork/guard.js.map +1 -1
- package/dist/commands/teamwork/index.d.ts.map +1 -1
- package/dist/commands/teamwork/index.js +139 -10
- package/dist/commands/teamwork/index.js.map +1 -1
- package/dist/commands/teamwork/kill.d.ts +2 -0
- package/dist/commands/teamwork/kill.d.ts.map +1 -1
- package/dist/commands/teamwork/kill.js +79 -38
- package/dist/commands/teamwork/kill.js.map +1 -1
- package/dist/commands/teamwork/messages.d.ts.map +1 -1
- package/dist/commands/teamwork/messages.js +3 -0
- package/dist/commands/teamwork/messages.js.map +1 -1
- package/dist/commands/teamwork/plan.d.ts +22 -0
- package/dist/commands/teamwork/plan.d.ts.map +1 -0
- package/dist/commands/teamwork/plan.js +288 -0
- package/dist/commands/teamwork/plan.js.map +1 -0
- package/dist/commands/teamwork/process-identity.d.ts +3 -0
- package/dist/commands/teamwork/process-identity.d.ts.map +1 -0
- package/dist/commands/teamwork/process-identity.js +24 -0
- package/dist/commands/teamwork/process-identity.js.map +1 -0
- package/dist/commands/teamwork/profiles.d.ts +43 -6
- package/dist/commands/teamwork/profiles.d.ts.map +1 -1
- package/dist/commands/teamwork/profiles.js +138 -110
- package/dist/commands/teamwork/profiles.js.map +1 -1
- package/dist/commands/teamwork/prompt.d.ts +4 -0
- package/dist/commands/teamwork/prompt.d.ts.map +1 -0
- package/dist/commands/teamwork/prompt.js +33 -0
- package/dist/commands/teamwork/prompt.js.map +1 -0
- package/dist/commands/teamwork/result.d.ts +54 -0
- package/dist/commands/teamwork/result.d.ts.map +1 -0
- package/dist/commands/teamwork/result.js +94 -0
- package/dist/commands/teamwork/result.js.map +1 -0
- package/dist/commands/teamwork/rm.d.ts.map +1 -1
- package/dist/commands/teamwork/rm.js +64 -64
- package/dist/commands/teamwork/rm.js.map +1 -1
- package/dist/commands/teamwork/run.d.ts +5 -0
- package/dist/commands/teamwork/run.d.ts.map +1 -1
- package/dist/commands/teamwork/run.js +120 -24
- package/dist/commands/teamwork/run.js.map +1 -1
- package/dist/commands/teamwork/runtime.d.ts +9 -0
- package/dist/commands/teamwork/runtime.d.ts.map +1 -0
- package/dist/commands/teamwork/runtime.js +372 -0
- package/dist/commands/teamwork/runtime.js.map +1 -0
- package/dist/commands/teamwork/send.d.ts +1 -0
- package/dist/commands/teamwork/send.d.ts.map +1 -1
- package/dist/commands/teamwork/send.js +2 -1
- package/dist/commands/teamwork/send.js.map +1 -1
- package/dist/commands/teamwork/spawn.d.ts +10 -3
- package/dist/commands/teamwork/spawn.d.ts.map +1 -1
- package/dist/commands/teamwork/spawn.js +41 -29
- package/dist/commands/teamwork/spawn.js.map +1 -1
- package/dist/commands/teamwork/store/lock.js +28 -4
- package/dist/commands/teamwork/store/lock.js.map +1 -1
- package/dist/commands/teamwork/supervisor/inbox.d.ts +1 -0
- package/dist/commands/teamwork/supervisor/inbox.d.ts.map +1 -1
- package/dist/commands/teamwork/supervisor/inbox.js +28 -9
- package/dist/commands/teamwork/supervisor/inbox.js.map +1 -1
- package/dist/commands/teamwork/supervisor/stdout.d.ts.map +1 -1
- package/dist/commands/teamwork/supervisor/stdout.js +2 -3
- package/dist/commands/teamwork/supervisor/stdout.js.map +1 -1
- package/dist/commands/teamwork/supervisor/warning.d.ts.map +1 -1
- package/dist/commands/teamwork/supervisor/warning.js +2 -3
- package/dist/commands/teamwork/supervisor/warning.js.map +1 -1
- package/dist/commands/teamwork/supervisor.d.ts +5 -0
- package/dist/commands/teamwork/supervisor.d.ts.map +1 -1
- package/dist/commands/teamwork/supervisor.js +21 -12
- package/dist/commands/teamwork/supervisor.js.map +1 -1
- package/dist/commands/teamwork/teammate-adapters.d.ts +0 -3
- package/dist/commands/teamwork/teammate-adapters.d.ts.map +1 -1
- package/dist/commands/teamwork/teammate-adapters.js +9 -54
- package/dist/commands/teamwork/teammate-adapters.js.map +1 -1
- package/dist/commands/teamwork/teammate-config.d.ts +5 -1
- package/dist/commands/teamwork/teammate-config.d.ts.map +1 -1
- package/dist/commands/teamwork/teammate-config.js +62 -19
- package/dist/commands/teamwork/teammate-config.js.map +1 -1
- package/dist/commands/teamwork/teammate-launch.d.ts +14 -4
- package/dist/commands/teamwork/teammate-launch.d.ts.map +1 -1
- package/dist/commands/teamwork/teammate-launch.js +129 -20
- package/dist/commands/teamwork/teammate-launch.js.map +1 -1
- package/dist/commands/teamwork/wait.d.ts +2 -0
- package/dist/commands/teamwork/wait.d.ts.map +1 -1
- package/dist/commands/teamwork/wait.js +44 -3
- package/dist/commands/teamwork/wait.js.map +1 -1
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +4 -3
- package/dist/commands/update.js.map +1 -1
- package/dist/configurators/workflow.d.ts.map +1 -1
- package/dist/configurators/workflow.js +14 -32
- package/dist/configurators/workflow.js.map +1 -1
- package/dist/migrations/manifests/0.7.1-beta.10.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.11.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.12.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.13.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.14.json +11 -0
- package/dist/migrations/manifests/0.7.1-beta.15.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.16.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.17.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.18.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.19.json +9 -0
- package/dist/migrations/manifests/0.7.1-beta.6.json +1 -1
- package/dist/migrations/manifests/0.7.2-beta.0.json +11 -0
- package/dist/templates/codex/hooks/session-start.py +14 -11
- package/dist/templates/codex/hooks.json +10 -0
- package/dist/templates/common/bundled-skills/trellis-meta/references/local-architecture/multi-agent-teamwork.md +14 -2
- package/dist/templates/common/bundled-skills/trellis-meta/references/local-architecture/task-system.md +1 -1
- package/dist/templates/common/bundled-skills/trellis-solution-design-and-convergence/workflow.md +4 -0
- package/dist/templates/common/bundled-skills/trellis-task-implementation/workflow.md +6 -0
- package/dist/templates/common/bundled-skills/trellis-teamwork/SKILL.md +14 -4
- package/dist/templates/common/bundled-skills/trellis-teamwork/references/coordination-modes.md +31 -2
- package/dist/templates/common/bundled-skills/trellis-teamwork/references/teammate-configuration-matrix.md +37 -31
- package/dist/templates/common/bundled-skills/trellis-teamwork/references/teammate-processes.md +94 -24
- package/dist/templates/common/bundled-skills/trellis-teamwork/references/teamwork-plan-construction.md +112 -20
- package/dist/templates/copilot/hooks/session-start.py +14 -11
- package/dist/templates/copilot/index.d.ts +1 -6
- package/dist/templates/copilot/index.d.ts.map +1 -1
- package/dist/templates/copilot/index.js +1 -14
- package/dist/templates/copilot/index.js.map +1 -1
- package/dist/templates/markdown/spec/backend/index.md.txt +4 -35
- package/dist/templates/markdown/spec/frontend/index.md.txt +4 -36
- package/dist/templates/omp/extensions/trellis/index.ts.txt +1 -1
- package/dist/templates/pi/extensions/trellis/index.ts.txt +17 -1
- package/dist/templates/shared-hooks/guard-teamwork-wait.py +53 -0
- package/dist/templates/shared-hooks/index.d.ts +1 -1
- package/dist/templates/shared-hooks/index.d.ts.map +1 -1
- package/dist/templates/shared-hooks/index.js +1 -0
- package/dist/templates/shared-hooks/index.js.map +1 -1
- package/dist/templates/shared-hooks/inject-workflow-state.py +8 -3
- package/dist/templates/shared-hooks/session-start.py +16 -12
- package/dist/templates/trellis/agents/delegated-worktree-primary-agent.md +9 -0
- package/dist/templates/trellis/agents/profiles/architecture.md +9 -0
- package/dist/templates/trellis/agents/profiles/diagnosis.md +9 -0
- package/dist/templates/trellis/agents/profiles/exploration.md +9 -0
- package/dist/templates/trellis/agents/profiles/research.md +9 -0
- package/dist/templates/trellis/agents/profiles/review.md +9 -0
- package/dist/templates/trellis/agents/profiles/verification.md +9 -0
- package/dist/templates/trellis/agents/teammate-profiles.json +56 -4
- package/dist/templates/trellis/agents/teammate.md +4 -63
- package/dist/templates/trellis/config.yaml +2 -5
- package/dist/templates/trellis/index.d.ts +1 -0
- package/dist/templates/trellis/index.d.ts.map +1 -1
- package/dist/templates/trellis/index.js +16 -4
- package/dist/templates/trellis/index.js.map +1 -1
- package/dist/templates/trellis/scripts/common/task_continuity.py +54 -28
- package/dist/templates/trellis/scripts/common/task_store.py +7 -2
- package/dist/templates/trellis/scripts/common/task_workflow.py +270 -18
- package/dist/templates/trellis/scripts/task.py +27 -3
- package/dist/templates/trellis/teamwork.json +10 -0
- package/dist/templates/trellis/workflow.md +7 -0
- package/dist/utils/asset-backup.d.ts.map +1 -1
- package/dist/utils/asset-backup.js +10 -4
- package/dist/utils/asset-backup.js.map +1 -1
- package/dist/utils/template-fetcher.d.ts +4 -19
- package/dist/utils/template-fetcher.d.ts.map +1 -1
- package/dist/utils/template-fetcher.js +9 -45
- package/dist/utils/template-fetcher.js.map +1 -1
- package/package.json +3 -2
- package/dist/templates/copilot/prompts/before-dev.prompt.md +0 -39
- package/dist/templates/copilot/prompts/brainstorm.prompt.md +0 -13
- package/dist/templates/copilot/prompts/break-loop.prompt.md +0 -129
- package/dist/templates/copilot/prompts/check-cross-layer.prompt.md +0 -170
- package/dist/templates/copilot/prompts/check.prompt.md +0 -110
- package/dist/templates/copilot/prompts/create-command.prompt.md +0 -116
- package/dist/templates/copilot/prompts/finish-work.prompt.md +0 -22
- package/dist/templates/copilot/prompts/integrate-skill.prompt.md +0 -223
- package/dist/templates/copilot/prompts/onboard.prompt.md +0 -362
- package/dist/templates/copilot/prompts/record-session.prompt.md +0 -58
- package/dist/templates/copilot/prompts/start.prompt.md +0 -65
- package/dist/templates/copilot/prompts/update-spec.prompt.md +0 -358
|
@@ -1,7 +1,17 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import path from "node:path";
|
|
2
4
|
import { InvalidArgumentError } from "commander";
|
|
3
5
|
import { isProvider, listProviders } from "./adapters/index.js";
|
|
4
6
|
import { parseCodexSandboxMode } from "./adapters/codex.js";
|
|
7
|
+
import { REASONING_EFFORTS, resolveTeammateProfile, } from "./profiles.js";
|
|
8
|
+
import { resolveCoordination, COORDINATION_MODES, } from "./coordination.js";
|
|
9
|
+
import { constructTeamworkPlan, constructTeamworkRetry } from "./plan.js";
|
|
10
|
+
import { CLI_TEAMMATE_HOST } from "./runtime.js";
|
|
11
|
+
import { teamworkBatch, teamworkReconcile, cleanupTeamworkAttemptEvidence, } from "./batch.js";
|
|
12
|
+
import { readPlanFile } from "./coordinator.js";
|
|
13
|
+
import { validateTeamworkPlan } from "./artifact.js";
|
|
14
|
+
import { resolveTeammateRuntimeConfig } from "./teammate-config.js";
|
|
5
15
|
import { teamworkSessionContextAdd, teamworkSessionContextDelete, teamworkSessionContextList, } from "./context.js";
|
|
6
16
|
import { createTeamworkSession } from "./create.js";
|
|
7
17
|
import { parseTrace } from "./dev-parse-trace.js";
|
|
@@ -17,6 +27,7 @@ import { teamworkSessionThreadPost, teamworkSessionThreadRename, teamworkSession
|
|
|
17
27
|
import { teamworkSessionTitleClear, teamworkSessionTitleSet } from "./title.js";
|
|
18
28
|
import { runSupervisor } from "./supervisor.js";
|
|
19
29
|
import { teamworkSessionWait, parseDuration } from "./wait.js";
|
|
30
|
+
import { failedTeamworkResult } from "./result.js";
|
|
20
31
|
import { parseCsv } from "./store/schema.js";
|
|
21
32
|
import { parseInboxPolicy } from "@pennixrv/trellis-core/teamwork";
|
|
22
33
|
function parseNonNegativeInteger(value) {
|
|
@@ -25,10 +36,42 @@ function parseNonNegativeInteger(value) {
|
|
|
25
36
|
}
|
|
26
37
|
return Number(value);
|
|
27
38
|
}
|
|
39
|
+
function parseReasoningEffort(value) {
|
|
40
|
+
if (!REASONING_EFFORTS.includes(value))
|
|
41
|
+
throw new InvalidArgumentError(`reasoning effort must be one of ${REASONING_EFFORTS.join(", ")}`);
|
|
42
|
+
return value;
|
|
43
|
+
}
|
|
28
44
|
export function registerTeamworkCommand(program) {
|
|
29
45
|
const teamwork = program
|
|
30
46
|
.command("teamwork")
|
|
31
47
|
.description("Trellis Teamwork runtime — coordinate teammates through a shared event log");
|
|
48
|
+
teamwork
|
|
49
|
+
.command("config")
|
|
50
|
+
.description("Resolve the project profile, execution configuration, and coordination defaults")
|
|
51
|
+
.option("--profile <name>", "professional profile")
|
|
52
|
+
.option("--configuration <name>", "candidate configuration within the profile")
|
|
53
|
+
.option("--mode <mode>", "general | advisor | committee")
|
|
54
|
+
.action((options) => {
|
|
55
|
+
if (options.mode &&
|
|
56
|
+
!COORDINATION_MODES.includes(options.mode))
|
|
57
|
+
throw new InvalidArgumentError("mode must be general, advisor, or committee");
|
|
58
|
+
const profile = resolveTeammateProfile({
|
|
59
|
+
cwd: process.cwd(),
|
|
60
|
+
...options,
|
|
61
|
+
});
|
|
62
|
+
console.log(JSON.stringify({
|
|
63
|
+
profile: profile.profile,
|
|
64
|
+
configuration: profile.configuration,
|
|
65
|
+
provider: profile.provider,
|
|
66
|
+
model: profile.model,
|
|
67
|
+
reasoning_effort: profile.reasoningEffort,
|
|
68
|
+
options: profile.options,
|
|
69
|
+
role_path: profile.rolePath,
|
|
70
|
+
professional_role_path: profile.professionalRolePath,
|
|
71
|
+
coordination: resolveCoordination(process.cwd(), options.mode),
|
|
72
|
+
capacityPolicy: resolveTeammateRuntimeConfig(process.cwd(), process.env, options.mode),
|
|
73
|
+
}));
|
|
74
|
+
});
|
|
32
75
|
teamwork
|
|
33
76
|
.command("create <name>")
|
|
34
77
|
.description("Create a Teamwork session")
|
|
@@ -93,6 +136,7 @@ export function registerTeamworkCommand(program) {
|
|
|
93
136
|
.option("--action <action>", "only wake on this thread action")
|
|
94
137
|
.option("--to <target>", "only wake on events targeted to this name (default: own agent)")
|
|
95
138
|
.option("--include-progress", "also wake on progress events")
|
|
139
|
+
.option("--json", "return one normalized result for a single --from worker")
|
|
96
140
|
.option("--all", "wait until each agent in --from has produced a matching event (default: first match wins)")
|
|
97
141
|
.action(async (name, raw) => {
|
|
98
142
|
const opts = raw;
|
|
@@ -108,9 +152,12 @@ export function registerTeamworkCommand(program) {
|
|
|
108
152
|
to: opts.to,
|
|
109
153
|
includeProgress: opts.includeProgress,
|
|
110
154
|
all: opts.all,
|
|
155
|
+
json: opts.json,
|
|
111
156
|
});
|
|
112
157
|
}
|
|
113
158
|
catch (err) {
|
|
159
|
+
if (opts.json)
|
|
160
|
+
console.log(JSON.stringify(failedTeamworkResult("interactive", { sessionId: name }, err)));
|
|
114
161
|
console.error(chalk.red("Error:"), err instanceof Error ? err.message : err);
|
|
115
162
|
process.exit(1);
|
|
116
163
|
}
|
|
@@ -143,13 +190,16 @@ export function registerTeamworkCommand(program) {
|
|
|
143
190
|
});
|
|
144
191
|
teamwork
|
|
145
192
|
.command("spawn <name>")
|
|
146
|
-
.description("Register a teammate process
|
|
193
|
+
.description("Register a teammate process in a Teamwork session; waits for the first targeted message")
|
|
147
194
|
.option("--scope <scope>", "Teamwork session scope: project | global")
|
|
148
195
|
.option("--agent <agent-name>", "load .trellis/agents/<name>.md (sets default --provider / --model / system prompt)")
|
|
149
|
-
.option("--provider <provider>", "teammate provider: claude | codex
|
|
196
|
+
.option("--provider <provider>", "teammate provider: claude | codex | copilot | dsh")
|
|
150
197
|
.option("--as <name>", "teammate name in the Teamwork session (default: <agent-name> if --agent is set)")
|
|
151
198
|
.option("--cwd <path>", "teammate working directory (default: process cwd)")
|
|
152
199
|
.option("--model <id>", "model override")
|
|
200
|
+
.option("--profile <id>", "professional teammate profile")
|
|
201
|
+
.option("--configuration <id>", "configuration within the selected profile")
|
|
202
|
+
.option("--reasoning-effort <effort>", "provider reasoning effort override", parseReasoningEffort)
|
|
153
203
|
.option("--resume <id>", "resume an existing session/thread id")
|
|
154
204
|
.option("--sandbox <mode>", "codex-only: teammate sandbox mode: read-only | workspace-write | danger-full-access (default workspace-write)")
|
|
155
205
|
.option("--timeout <duration>", "auto-kill teammate process after this duration (e.g. 30m, 1h, 7200s)")
|
|
@@ -174,6 +224,9 @@ export function registerTeamworkCommand(program) {
|
|
|
174
224
|
as: opts.as,
|
|
175
225
|
cwd: opts.cwd,
|
|
176
226
|
model: opts.model,
|
|
227
|
+
profile: opts.profile,
|
|
228
|
+
configuration: opts.configuration,
|
|
229
|
+
reasoningEffort: opts.reasoningEffort,
|
|
177
230
|
resume: opts.resume,
|
|
178
231
|
sandbox,
|
|
179
232
|
timeoutMs: parseDuration(opts.timeout),
|
|
@@ -192,38 +245,108 @@ export function registerTeamworkCommand(program) {
|
|
|
192
245
|
process.exit(1);
|
|
193
246
|
}
|
|
194
247
|
});
|
|
248
|
+
teamwork
|
|
249
|
+
.command("plan <spec>")
|
|
250
|
+
.description("Resolve project configuration and publish an immutable Teamwork plan and briefs")
|
|
251
|
+
.requiredOption("--task <path>", "current task directory")
|
|
252
|
+
.requiredOption("--output <path>", "new plan file")
|
|
253
|
+
.option("--dry-run", "validate and resolve without writing files or starting processes")
|
|
254
|
+
.action((spec, opts) => {
|
|
255
|
+
const plan = constructTeamworkPlan({
|
|
256
|
+
draft: JSON.parse(fs.readFileSync(spec, "utf8")),
|
|
257
|
+
cwd: process.cwd(),
|
|
258
|
+
taskRoot: path.resolve(opts.task),
|
|
259
|
+
output: path.resolve(opts.output),
|
|
260
|
+
host: CLI_TEAMMATE_HOST,
|
|
261
|
+
dryRun: opts.dryRun,
|
|
262
|
+
});
|
|
263
|
+
console.log(JSON.stringify(plan));
|
|
264
|
+
});
|
|
195
265
|
teamwork
|
|
196
266
|
.command("batch <plan>")
|
|
197
|
-
.description("
|
|
198
|
-
.
|
|
267
|
+
.description("Execute a frozen Teamwork plan through foreground provider processes")
|
|
268
|
+
.requiredOption("--task <path>", "current task directory")
|
|
269
|
+
.option("--json", "return the normalized Teamwork result with report references")
|
|
270
|
+
.option("--preflight", "read-only validation; creates no files or provider processes")
|
|
271
|
+
.action(async (planPath, opts) => {
|
|
199
272
|
try {
|
|
200
|
-
|
|
273
|
+
await teamworkBatch(planPath, opts);
|
|
201
274
|
}
|
|
202
275
|
catch (err) {
|
|
276
|
+
if (opts.json)
|
|
277
|
+
console.log(JSON.stringify({
|
|
278
|
+
schemaVersion: 1,
|
|
279
|
+
kind: "trellis_result",
|
|
280
|
+
mode: "batch",
|
|
281
|
+
association: { planPath },
|
|
282
|
+
execution: {
|
|
283
|
+
status: "error",
|
|
284
|
+
stopped: false,
|
|
285
|
+
reason: err instanceof Error ? err.message : String(err),
|
|
286
|
+
},
|
|
287
|
+
reports: [],
|
|
288
|
+
semanticValidation: "not_run",
|
|
289
|
+
disposition: "unknown",
|
|
290
|
+
}));
|
|
203
291
|
console.error(chalk.red("Error:"), err instanceof Error ? err.message : err);
|
|
204
292
|
process.exit(1);
|
|
205
293
|
}
|
|
206
294
|
});
|
|
295
|
+
teamwork
|
|
296
|
+
.command("cleanup-artifacts <plan>")
|
|
297
|
+
.description("Preview settled attempt evidence cleanup; delete only with the matching preview digest")
|
|
298
|
+
.requiredOption("--task <path>", "owning task directory")
|
|
299
|
+
.option("--confirm <digest>", "confirm the exact current preview digest")
|
|
300
|
+
.action(async (file, options) => {
|
|
301
|
+
const taskRoot = path.resolve(options.task);
|
|
302
|
+
const plan = validateTeamworkPlan(readPlanFile(path.resolve(file)), taskRoot, undefined, { allowExpired: true });
|
|
303
|
+
console.log(JSON.stringify(await cleanupTeamworkAttemptEvidence(plan, taskRoot, process.cwd(), options.confirm)));
|
|
304
|
+
});
|
|
305
|
+
teamwork
|
|
306
|
+
.command("reconcile <plan>")
|
|
307
|
+
.description("Preview or explicitly retire an uncertain batch after verifying process exit")
|
|
308
|
+
.requiredOption("--task <path>", "original task directory")
|
|
309
|
+
.option("--execute", "record verified disposition and release the original capacity reservation")
|
|
310
|
+
.option("--reason <text>", "explicit disposition reason, required with --execute")
|
|
311
|
+
.action(teamworkReconcile);
|
|
312
|
+
teamwork
|
|
313
|
+
.command("retry <plan>")
|
|
314
|
+
.description("Publish a linked retry round for selected failed assignments; never rerun accepted work")
|
|
315
|
+
.requiredOption("--task <path>", "original task directory")
|
|
316
|
+
.requiredOption("--output <path>", "new retry plan inside the task")
|
|
317
|
+
.requiredOption("--batch <id>", "new retry batch identity")
|
|
318
|
+
.requiredOption("--assignments <ids>", "comma-separated failed assignment ids")
|
|
319
|
+
.requiredOption("--deadline <iso>", "new round deadline")
|
|
320
|
+
.requiredOption("--approval-ref <text>", "explicit authorization for this retry round")
|
|
321
|
+
.action(async (planPath, options) => {
|
|
322
|
+
console.log(JSON.stringify(await constructTeamworkRetry({
|
|
323
|
+
...options,
|
|
324
|
+
cwd: process.cwd(),
|
|
325
|
+
taskRoot: path.resolve(options.task),
|
|
326
|
+
output: path.resolve(options.output),
|
|
327
|
+
planPath: path.resolve(planPath),
|
|
328
|
+
})));
|
|
329
|
+
});
|
|
207
330
|
teamwork
|
|
208
331
|
.command("run [name]")
|
|
209
332
|
.description("One-shot: create an ephemeral Teamwork session, start a teammate, send the prompt, wait for completion, print the answer, and clean up")
|
|
210
333
|
.option("--agent <agent-name>", "load .trellis/agents/<name>.md (sets default --provider / --as / system prompt)")
|
|
211
|
-
.option("--provider <provider>", "teammate provider: claude | codex
|
|
334
|
+
.option("--provider <provider>", "teammate provider: claude | codex | copilot | dsh")
|
|
212
335
|
.option("--as <name>", "teammate name (default: agent name if --agent set)")
|
|
213
336
|
.option("--cwd <path>", "teammate working directory")
|
|
214
337
|
.option("--model <id>", "model override")
|
|
338
|
+
.option("--profile <id>", "professional teammate profile")
|
|
339
|
+
.option("--configuration <id>", "configuration within the selected profile")
|
|
340
|
+
.option("--reasoning-effort <effort>", "provider reasoning effort override", parseReasoningEffort)
|
|
215
341
|
.option("--file <path>", "include a file as context (glob supported, repeatable)", (val, prev) => [...(prev ?? []), val], [])
|
|
216
342
|
.option("--jsonl <path>", "parse a Trellis jsonl manifest and include each referenced file (repeatable)", (val, prev) => [...(prev ?? []), val], [])
|
|
217
343
|
.option("--message <text>", "inline prompt text")
|
|
218
344
|
.option("--message-file <path>", "read prompt body from file")
|
|
219
345
|
.option("--stdin", "read prompt body from stdin")
|
|
346
|
+
.option("--json", "return the normalized Teamwork result instead of its answer")
|
|
220
347
|
.option("--timeout <duration>", "max time to wait for done (e.g. 30s, 5m, 1h; default 5m)")
|
|
221
348
|
.action(async (name, raw) => {
|
|
222
349
|
const opts = raw;
|
|
223
|
-
if (opts.provider !== undefined && !isProvider(opts.provider)) {
|
|
224
|
-
console.error(chalk.red("Error:"), `--provider must be one of: ${listProviders().join(", ")}`);
|
|
225
|
-
process.exit(1);
|
|
226
|
-
}
|
|
227
350
|
try {
|
|
228
351
|
await teamworkSessionRun({
|
|
229
352
|
name,
|
|
@@ -232,15 +355,21 @@ export function registerTeamworkCommand(program) {
|
|
|
232
355
|
as: opts.as,
|
|
233
356
|
cwd: opts.cwd,
|
|
234
357
|
model: opts.model,
|
|
358
|
+
profile: opts.profile,
|
|
359
|
+
configuration: opts.configuration,
|
|
360
|
+
reasoningEffort: opts.reasoningEffort,
|
|
235
361
|
files: opts.file,
|
|
236
362
|
jsonls: opts.jsonl,
|
|
237
363
|
message: opts.message,
|
|
238
364
|
textFile: opts.messageFile,
|
|
239
365
|
stdin: opts.stdin,
|
|
366
|
+
json: opts.json,
|
|
240
367
|
timeoutMs: parseDuration(opts.timeout),
|
|
241
368
|
});
|
|
242
369
|
}
|
|
243
370
|
catch (err) {
|
|
371
|
+
if (opts.json)
|
|
372
|
+
console.log(JSON.stringify(failedTeamworkResult("interactive", name ? { sessionId: name } : {}, err, true)));
|
|
244
373
|
console.error(chalk.red("Error:"), err instanceof Error ? err.message : err);
|
|
245
374
|
process.exit(1);
|
|
246
375
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/teamwork/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/teamwork/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,8 @@ export interface KillOptions {
|
|
|
2
2
|
as: string;
|
|
3
3
|
force?: boolean;
|
|
4
4
|
scope?: string;
|
|
5
|
+
/** Internal project bucket for session removal across projects. */
|
|
6
|
+
project?: string;
|
|
5
7
|
}
|
|
6
8
|
export declare function teamworkSessionKill(sessionId: string, opts: KillOptions): Promise<void>;
|
|
7
9
|
//# sourceMappingURL=kill.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kill.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/kill.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"kill.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/kill.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAKD,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,IAAI,CAAC,CAcf"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
+
import { isSupervisorProcess } from "./guard.js";
|
|
3
|
+
import { readProcessIdentity } from "./process-identity.js";
|
|
2
4
|
import { appendEvent } from "./store/events.js";
|
|
3
5
|
import { withLock } from "./store/lock.js";
|
|
4
6
|
import { resolveExistingTeamworkSession, workerFile, workerLockPath, } from "./store/paths.js";
|
|
@@ -6,21 +8,35 @@ import { parseTeamworkSessionScope } from "./store/schema.js";
|
|
|
6
8
|
const POLL_INTERVAL_MS = 100;
|
|
7
9
|
const KILL_GRACE_MS = 8000; // generous: supervisor's own grace is ~6s
|
|
8
10
|
export async function teamworkSessionKill(sessionId, opts) {
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
const project = opts.project ??
|
|
12
|
+
resolveExistingTeamworkSession(sessionId, {
|
|
13
|
+
scope: parseTeamworkSessionScope(opts.scope),
|
|
14
|
+
}).project;
|
|
12
15
|
// Take the teammate lock so kill ↔ spawn can't race: spawn won't claim a
|
|
13
16
|
// stale pid file while we're tearing it down; we won't try to kill a
|
|
14
17
|
// teammate whose pid file is mid-creation.
|
|
15
|
-
return withLock(workerLockPath(sessionId, opts.as,
|
|
18
|
+
return withLock(workerLockPath(sessionId, opts.as, project), () => killLocked(sessionId, opts, project), { maxWaitMs: KILL_GRACE_MS + 2000 });
|
|
16
19
|
}
|
|
17
20
|
async function killLocked(sessionId, opts, project) {
|
|
18
21
|
const pidPath = workerFile(sessionId, opts.as, "pid", project);
|
|
19
|
-
|
|
22
|
+
const workerPidPath = workerFile(sessionId, opts.as, "worker-pid", project);
|
|
23
|
+
if (!fs.existsSync(pidPath) && !fs.existsSync(workerPidPath)) {
|
|
20
24
|
throw new Error(`Teammate '${opts.as}' not running in Teamwork Session '${sessionId}'`);
|
|
21
25
|
}
|
|
22
|
-
const supervisorPid =
|
|
26
|
+
const supervisorPid = fs.existsSync(pidPath)
|
|
27
|
+
? Number(fs.readFileSync(pidPath, "utf-8").trim())
|
|
28
|
+
: 0;
|
|
29
|
+
if (fs.existsSync(pidPath) &&
|
|
30
|
+
(!Number.isSafeInteger(supervisorPid) || supervisorPid <= 0)) {
|
|
31
|
+
throw new Error("Cannot verify supervisor PID; recovery files preserved");
|
|
32
|
+
}
|
|
33
|
+
if (supervisorPid &&
|
|
34
|
+
alive(supervisorPid) &&
|
|
35
|
+
!isSupervisorProcess(supervisorPid, sessionId, opts.as)) {
|
|
36
|
+
throw new Error("Cannot verify supervisor process identity; recovery files preserved");
|
|
37
|
+
}
|
|
23
38
|
if (!supervisorPid || !alive(supervisorPid)) {
|
|
39
|
+
await terminateRecordedChild(sessionId, opts.as, project);
|
|
24
40
|
await appendEvent(sessionId, {
|
|
25
41
|
kind: "error",
|
|
26
42
|
by: `cli:kill`,
|
|
@@ -32,24 +48,8 @@ async function killLocked(sessionId, opts, project) {
|
|
|
32
48
|
}
|
|
33
49
|
if (opts.force) {
|
|
34
50
|
// Also kill the teammate process so it doesn't become an orphan.
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
const wpid = Number(fs.readFileSync(workerPidPath, "utf-8").trim());
|
|
38
|
-
if (wpid && alive(wpid)) {
|
|
39
|
-
try {
|
|
40
|
-
process.kill(wpid, "SIGKILL");
|
|
41
|
-
}
|
|
42
|
-
catch {
|
|
43
|
-
// already dead
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
try {
|
|
48
|
-
process.kill(supervisorPid, "SIGKILL");
|
|
49
|
-
}
|
|
50
|
-
catch {
|
|
51
|
-
// already dead
|
|
52
|
-
}
|
|
51
|
+
await terminateRecordedChild(sessionId, opts.as, project);
|
|
52
|
+
signalSupervisor(supervisorPid, "SIGKILL", sessionId, opts.as);
|
|
53
53
|
// SIGKILL skips supervisor's onShutdown handler, so the `killed`
|
|
54
54
|
// event would never make it into events.jsonl. Write it from here
|
|
55
55
|
// so forensic readers see the kill happened.
|
|
@@ -62,12 +62,7 @@ async function killLocked(sessionId, opts, project) {
|
|
|
62
62
|
}, project);
|
|
63
63
|
}
|
|
64
64
|
else {
|
|
65
|
-
|
|
66
|
-
process.kill(supervisorPid, "SIGTERM");
|
|
67
|
-
}
|
|
68
|
-
catch {
|
|
69
|
-
// already dead
|
|
70
|
-
}
|
|
65
|
+
signalSupervisor(supervisorPid, "SIGTERM", sessionId, opts.as);
|
|
71
66
|
}
|
|
72
67
|
// Wait for supervisor to actually exit
|
|
73
68
|
const deadline = Date.now() + KILL_GRACE_MS;
|
|
@@ -78,12 +73,13 @@ async function killLocked(sessionId, opts, project) {
|
|
|
78
73
|
// Grace expired — force kill. Supervisor's onShutdown handler never
|
|
79
74
|
// got to fire (or it deadlocked), so we write the `killed` event from
|
|
80
75
|
// the CLI side to keep the Teamwork Session log truthful.
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
76
|
+
await terminateRecordedChild(sessionId, opts.as, project);
|
|
77
|
+
signalSupervisor(supervisorPid, "SIGKILL", sessionId, opts.as);
|
|
78
|
+
const forcedDeadline = Date.now() + KILL_GRACE_MS;
|
|
79
|
+
while (alive(supervisorPid) && Date.now() < forcedDeadline)
|
|
80
|
+
await sleep(POLL_INTERVAL_MS);
|
|
81
|
+
if (alive(supervisorPid))
|
|
82
|
+
throw new Error("Supervisor did not exit; recovery files preserved");
|
|
87
83
|
await appendEvent(sessionId, {
|
|
88
84
|
kind: "killed",
|
|
89
85
|
by: "cli:kill",
|
|
@@ -93,17 +89,61 @@ async function killLocked(sessionId, opts, project) {
|
|
|
93
89
|
detail: "grace expired, supervisor SIGKILL'd by CLI",
|
|
94
90
|
}, project);
|
|
95
91
|
}
|
|
92
|
+
await terminateRecordedChild(sessionId, opts.as, project);
|
|
96
93
|
cleanupFiles(sessionId, opts.as, project);
|
|
97
94
|
}
|
|
95
|
+
function signalSupervisor(pid, signal, sessionId, worker) {
|
|
96
|
+
if (!alive(pid))
|
|
97
|
+
return;
|
|
98
|
+
if (!isSupervisorProcess(pid, sessionId, worker))
|
|
99
|
+
throw new Error("Cannot verify supervisor process identity; recovery files preserved");
|
|
100
|
+
try {
|
|
101
|
+
process.kill(pid, signal);
|
|
102
|
+
}
|
|
103
|
+
catch (error) {
|
|
104
|
+
if (error.code !== "ESRCH")
|
|
105
|
+
throw error;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
98
108
|
function alive(pid) {
|
|
109
|
+
if (!Number.isSafeInteger(pid) || pid <= 0)
|
|
110
|
+
return false;
|
|
99
111
|
try {
|
|
100
112
|
process.kill(pid, 0);
|
|
101
113
|
return true;
|
|
102
114
|
}
|
|
103
|
-
catch {
|
|
104
|
-
return
|
|
115
|
+
catch (error) {
|
|
116
|
+
return error.code === "EPERM";
|
|
105
117
|
}
|
|
106
118
|
}
|
|
119
|
+
async function terminateRecordedChild(sessionId, worker, project) {
|
|
120
|
+
const pidPath = workerFile(sessionId, worker, "worker-pid", project);
|
|
121
|
+
if (!fs.existsSync(pidPath))
|
|
122
|
+
return;
|
|
123
|
+
const pid = Number(fs.readFileSync(pidPath, "utf-8").trim());
|
|
124
|
+
if (!Number.isSafeInteger(pid) || pid <= 0)
|
|
125
|
+
throw new Error("Cannot verify orphan teammate PID; recovery files preserved");
|
|
126
|
+
if (!alive(pid))
|
|
127
|
+
return;
|
|
128
|
+
const identityPath = workerFile(sessionId, worker, "worker-identity", project);
|
|
129
|
+
const expected = fs.existsSync(identityPath)
|
|
130
|
+
? fs.readFileSync(identityPath, "utf-8").trim()
|
|
131
|
+
: undefined;
|
|
132
|
+
if (!expected || readProcessIdentity(pid) !== expected)
|
|
133
|
+
throw new Error("Cannot verify orphan teammate process identity; recovery files preserved");
|
|
134
|
+
try {
|
|
135
|
+
process.kill(pid, "SIGKILL");
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
if (error.code !== "ESRCH")
|
|
139
|
+
throw error;
|
|
140
|
+
}
|
|
141
|
+
const deadline = Date.now() + KILL_GRACE_MS;
|
|
142
|
+
while (alive(pid) && Date.now() < deadline)
|
|
143
|
+
await sleep(POLL_INTERVAL_MS);
|
|
144
|
+
if (alive(pid))
|
|
145
|
+
throw new Error("Orphan teammate did not exit; recovery files preserved");
|
|
146
|
+
}
|
|
107
147
|
function cleanupFiles(sessionId, worker, project) {
|
|
108
148
|
// Keep `log` (forensic), `session-id` / `thread-id` (resume).
|
|
109
149
|
// `system-prompt.md` may carry a large injected context; on Windows the
|
|
@@ -112,6 +152,7 @@ function cleanupFiles(sessionId, worker, project) {
|
|
|
112
152
|
for (const suffix of [
|
|
113
153
|
"pid",
|
|
114
154
|
"worker-pid",
|
|
155
|
+
"worker-identity",
|
|
115
156
|
"config",
|
|
116
157
|
"system-prompt.md",
|
|
117
158
|
"spawnlock",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kill.js","sourceRoot":"","sources":["../../../src/commands/teamwork/kill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"kill.js","sourceRoot":"","sources":["../../../src/commands/teamwork/kill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,8BAA8B,EAC9B,UAAU,EACV,cAAc,GACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAU9D,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,0CAA0C;AAEtE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,SAAiB,EACjB,IAAiB;IAEjB,MAAM,OAAO,GACX,IAAI,CAAC,OAAO;QACZ,8BAA8B,CAAC,SAAS,EAAE;YACxC,KAAK,EAAE,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC;SAC7C,CAAC,CAAC,OAAO,CAAC;IACb,yEAAyE;IACzE,qEAAqE;IACrE,2CAA2C;IAC3C,OAAO,QAAQ,CACb,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,EAC3C,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC1C,EAAE,SAAS,EAAE,aAAa,GAAG,IAAI,EAAE,CACpC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,SAAiB,EACjB,IAAiB,EACjB,OAAe;IAEf,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAC5E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CACb,aAAa,IAAI,CAAC,EAAE,sCAAsC,SAAS,GAAG,CACvE,CAAC;IACJ,CAAC;IACD,MAAM,aAAa,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QAC1C,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC,CAAC;IACN,IACE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QACtB,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,aAAa,IAAI,CAAC,CAAC,EAC5D,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IACD,IACE,aAAa;QACb,KAAK,CAAC,aAAa,CAAC;QACpB,CAAC,mBAAmB,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,EACvD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;QAC5C,MAAM,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,WAAW,CACf,SAAS,EACT;YACE,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,UAAU;YACd,OAAO,EAAE,wBAAwB,aAAa,GAAG;YACjD,MAAM,EAAE,IAAI,CAAC,EAAE;SAChB,EACD,OAAO,CACR,CAAC;QACF,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1C,OAAO;IACT,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,iEAAiE;QACjE,MAAM,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1D,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/D,iEAAiE;QACjE,kEAAkE;QAClE,6CAA6C;QAC7C,MAAM,WAAW,CACf,SAAS,EACT;YACE,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,UAAU;YACd,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,MAAM,EAAE,eAAe;YACvB,MAAM,EAAE,SAAS;SAClB,EACD,OAAO,CACR,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,uCAAuC;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,CAAC;IAC5C,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QACrD,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;QACzB,oEAAoE;QACpE,sEAAsE;QACtE,0DAA0D;QAC1D,MAAM,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1D,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/D,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,CAAC;QAClD,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc;YACxD,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAChC,IAAI,KAAK,CAAC,aAAa,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,MAAM,WAAW,CACf,SAAS,EACT;YACE,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,UAAU;YACd,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,MAAM,EAAE,eAAe;YACvB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,4CAA4C;SACrD,EACD,OAAO,CACR,CAAC;IACJ,CAAC;IAED,MAAM,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC1D,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,gBAAgB,CACvB,GAAW,EACX,MAAsB,EACtB,SAAiB,EACjB,MAAc;IAEd,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,OAAO;IACxB,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC;QAC9C,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;IACJ,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;YAAE,MAAM,KAAK,CAAC;IACrE,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,GAAW;IACxB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACzD,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAQ,KAA+B,CAAC,IAAI,KAAK,OAAO,CAAC;IAC3D,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,SAAiB,EACjB,MAAc,EACd,OAAe;IAEf,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO;IACpC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;IACJ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,OAAO;IACxB,MAAM,YAAY,GAAG,UAAU,CAC7B,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,OAAO,CACR,CAAC;IACF,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAC1C,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE;QAC/C,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,CAAC,QAAQ,IAAI,mBAAmB,CAAC,GAAG,CAAC,KAAK,QAAQ;QACpD,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;IACJ,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;YAAE,MAAM,KAAK,CAAC;IACrE,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,CAAC;IAC5C,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ;QAAE,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC1E,IAAI,KAAK,CAAC,GAAG,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,YAAY,CACnB,SAAiB,EACjB,MAAc,EACd,OAAe;IAEf,8DAA8D;IAC9D,wEAAwE;IACxE,yEAAyE;IACzE,uEAAuE;IACvE,KAAK,MAAM,MAAM,IAAI;QACnB,KAAK;QACL,YAAY;QACZ,iBAAiB;QACjB,QAAQ;QACR,kBAAkB;QAClB,WAAW;KACZ,EAAE,CAAC;QACF,IAAI,CAAC;YACH,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAChE,CAAC;QAAC,MAAM,CAAC;YACP,eAAe;QACjB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/messages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/messages.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,IAAI,CAAC,CAsEf"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import chalk from "chalk";
|
|
3
|
+
import { redactDiagnostic } from "@pennixrv/trellis-core/teamwork";
|
|
3
4
|
import { parseTeamworkEventKind, readTeamworkEvents, readTeamworkSessionMetadata, } from "./store/events.js";
|
|
4
5
|
import { matchesEventFilter } from "./store/filter.js";
|
|
5
6
|
import { eventsPath, resolveExistingTeamworkSession } from "./store/paths.js";
|
|
@@ -70,6 +71,8 @@ export async function teamworkSessionMessages(sessionId, opts) {
|
|
|
70
71
|
}
|
|
71
72
|
}
|
|
72
73
|
function printEvent(ev, raw) {
|
|
74
|
+
if (ev.kind === "error" || ev.kind === "progress")
|
|
75
|
+
ev = redactDiagnostic(ev);
|
|
73
76
|
if (raw) {
|
|
74
77
|
console.log(JSON.stringify(ev));
|
|
75
78
|
return;
|