@pennixrv/trellis 0.7.1 → 0.7.2-beta.0

package/dist/commands/teamwork/teammate-config.d.ts

@@ -1,3 +1,4 @@
+import { type CoordinationMode } from "./coordination.js";
 export interface TeammateConfig {
     maxConcurrency: number;
 }
@@ -9,10 +10,13 @@ export interface TeammateRuntimeConfig {
     teammate: TeammateConfig;
     guard: TeammateGuardConfig;
     sourceDigest?: string;
+    source?: string;
+    diagnostics?: string[];
 }
-export declare function resolveTeammateRuntimeConfig(cwd?: string, env?: NodeJS.ProcessEnv): TeammateRuntimeConfig;
+export declare function resolveTeammateRuntimeConfig(cwd?: string, env?: NodeJS.ProcessEnv, mode?: CoordinationMode): TeammateRuntimeConfig;
 export declare function effectiveTeammateCapacity(input: {
     requested?: number;
+    assignmentCount?: number;
     config: TeammateRuntimeConfig;
     verifiedHostCap: number;
 }): number;

package/dist/commands/teamwork/teammate-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"teammate-config.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-config.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,mBAAmB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAsDD,wBAAgB,4BAA4B,CAC1C,GAAG,SAAgB,EACnB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,qBAAqB,CA2CvB;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,MAAM,CAuCT"}
+{"version":3,"file":"teammate-config.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-config.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,mBAAmB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AA2DD,wBAAgB,4BAA4B,CAC1C,GAAG,SAAgB,EACnB,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,IAAI,CAAC,EAAE,gBAAgB,GACtB,qBAAqB,CA2FvB;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,MAAM,CA2CT"}

package/dist/commands/teamwork/teammate-config.js

@@ -2,9 +2,15 @@ import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { DIR_NAMES } from "../../constants/paths.js";
+import { DEFAULT_TEAMWORK_CONFIG, readCoordinationConfig, } from "./coordination.js";
 const DEFAULT_CONFIG = {
-    teammate: { maxConcurrency: 1 },
-    guard: { maxLiveTeammates: 6, nonBatchReserved: 0 },
+    teammate: {
+        maxConcurrency: DEFAULT_TEAMWORK_CONFIG.modes.general.max_concurrency,
+    },
+    guard: {
+        maxLiveTeammates: DEFAULT_TEAMWORK_CONFIG.resources.max_live_teammates,
+        nonBatchReserved: DEFAULT_TEAMWORK_CONFIG.resources.non_batch_reserved,
+    },
 };
 function integer(value, field, positive = false) {
     if (value === undefined)
@@ -44,45 +50,80 @@ function yamlInteger(content, section, key) {
     }
     return undefined;
 }
-export function resolveTeammateRuntimeConfig(cwd = process.cwd(), env = process.env) {
+export function resolveTeammateRuntimeConfig(cwd = process.cwd(), env = process.env, mode) {
     const configPath = path.join(cwd, DIR_NAMES.WORKFLOW, "config.yaml");
     let content = "";
     try {
         content = fs.readFileSync(configPath, "utf8");
     }
-    catch {
-        // Built-in defaults are intentionally conservative.
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
     }
+    const resolved = readCoordinationConfig(cwd);
+    const selected = mode ?? resolved.config.default_mode;
+    const legacyConcurrency = yamlInteger(content, "teammate", "max_concurrency");
+    const legacyLive = yamlInteger(content, "teammate_guard", "max_live_teammates");
+    const legacyReserved = yamlInteger(content, "teammate_guard", "non_batch_reserved");
+    const diagnostics = [];
+    if (legacyConcurrency !== undefined ||
+        legacyLive !== undefined ||
+        legacyReserved !== undefined)
+        diagnostics.push(resolved.legacy
+            ? "Legacy YAML capacity is active; migrate to .trellis/teamwork.json schema 2."
+            : "Legacy YAML capacity keys are ignored by teamwork.json schema 2; review trellis update output and merge custom config.yaml manually if needed.");
+    if (resolved.legacy && resolved.source !== "built-in")
+        diagnostics.push("Legacy teamwork.json schema 1; update to schema 2 for mode-specific capacity.");
+    for (const key of [
+        "TRELLIS_TEAMWORK_TEAMMATE_MAX_CONCURRENCY",
+        "TRELLIS_TEAMWORK_MAX_LIVE_TEAMMATES",
+        "TRELLIS_TEAMWORK_TEAMMATE_RESERVED",
+    ])
+        if (env[key])
+            diagnostics.push(`${key} explicitly overrides the project capacity policy.`);
     const maxConcurrency = integer(env.TRELLIS_TEAMWORK_TEAMMATE_MAX_CONCURRENCY
         ? Number(env.TRELLIS_TEAMWORK_TEAMMATE_MAX_CONCURRENCY)
-        : yamlInteger(content, "teammate", "max_concurrency"), "teamwork.teammate.max_concurrency", true) ?? DEFAULT_CONFIG.teammate.maxConcurrency;
+        : resolved.legacy && legacyConcurrency !== undefined
+            ? legacyConcurrency
+            : resolved.config.modes[selected].max_concurrency, "teamwork.teammate.max_concurrency", true) ?? DEFAULT_CONFIG.teammate.maxConcurrency;
     const maxLiveTeammates = integer(env.TRELLIS_TEAMWORK_MAX_LIVE_TEAMMATES
         ? Number(env.TRELLIS_TEAMWORK_MAX_LIVE_TEAMMATES)
-        : yamlInteger(content, "teammate_guard", "max_live_teammates"), "teamwork.teammate_guard.max_live_teammates", true) ?? DEFAULT_CONFIG.guard.maxLiveTeammates;
+        : resolved.legacy && legacyLive !== undefined
+            ? legacyLive
+            : resolved.config.resources.max_live_teammates, "teamwork.teammate_guard.max_live_teammates") ?? DEFAULT_CONFIG.guard.maxLiveTeammates;
     const nonBatchReserved = integer(env.TRELLIS_TEAMWORK_TEAMMATE_RESERVED
         ? Number(env.TRELLIS_TEAMWORK_TEAMMATE_RESERVED)
-        : yamlInteger(content, "teammate_guard", "non_batch_reserved"), "teamwork.teammate_guard.non_batch_reserved") ?? DEFAULT_CONFIG.guard.nonBatchReserved;
+        : resolved.legacy && legacyReserved !== undefined
+            ? legacyReserved
+            : resolved.config.resources.non_batch_reserved, "teamwork.teammate_guard.non_batch_reserved") ?? DEFAULT_CONFIG.guard.nonBatchReserved;
     return {
         teammate: { maxConcurrency },
         guard: { maxLiveTeammates, nonBatchReserved },
-        ...(content
-            ? {
-                sourceDigest: crypto
-                    .createHash("sha256")
-                    .update(content)
-                    .digest("hex"),
-            }
-            : {}),
+        source: resolved.source,
+        diagnostics,
+        sourceDigest: crypto
+            .createHash("sha256")
+            .update(content +
+            resolved.configDigest +
+            JSON.stringify({
+                maxConcurrency,
+                maxLiveTeammates,
+                nonBatchReserved,
+            }))
+            .digest("hex"),
     };
 }
 export function effectiveTeammateCapacity(input) {
     integer(input.config.teammate.maxConcurrency, "teamwork.teammate.max_concurrency", true);
-    integer(input.config.guard.maxLiveTeammates, "teamwork.teammate_guard.max_live_teammates", true);
+    integer(input.config.guard.maxLiveTeammates, "teamwork.teammate_guard.max_live_teammates");
     integer(input.config.guard.nonBatchReserved, "teamwork.teammate_guard.non_batch_reserved");
     const requested = input.requested ?? input.config.teammate.maxConcurrency;
     integer(requested, "batch.requested_capacity", true);
     integer(input.verifiedHostCap, "verified_host_cap", true);
-    const availableGuard = input.config.guard.maxLiveTeammates - input.config.guard.nonBatchReserved;
+    const availableGuard = input.config.guard.maxLiveTeammates === 0
+        ? Infinity
+        : input.config.guard.maxLiveTeammates -
+            input.config.guard.nonBatchReserved;
     if (availableGuard <= 0) {
         throw new Error("teamwork.teammate_guard has no capacity after non-batch reservations");
     }
@@ -92,6 +133,8 @@ export function effectiveTeammateCapacity(input) {
     if (input.requested !== undefined && input.requested > capacity) {
         throw new Error(`requested teammate capacity ${input.requested} exceeds verified limit ${capacity}`);
     }
-    return capacity;
+    if (input.assignmentCount !== undefined)
+        integer(input.assignmentCount, "batch.assignment_count", true);
+    return Math.min(capacity, input.assignmentCount ?? capacity);
 }
 //# sourceMappingURL=teammate-config.js.map

package/dist/commands/teamwork/teammate-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"teammate-config.js","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"teammate-config.js","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-config.ts"],"names":[],"mappings":"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"}

package/dist/commands/teamwork/teammate-launch.d.ts

@@ -1,5 +1,6 @@
 import { type TeammateAdapterContract, type TeammateHostCapabilities } from "./teammate-adapters.js";
-import type { ResolvedTeammateProfile } from "./profiles.js";
+import { type ResolvedTeammateProfile } from "./profiles.js";
+/** Role obligations frozen with the launch, not filesystem or Git isolation. */
 export interface TeammateWritePolicy {
     protectedTargets: "read-only";
     gitState: "read-only";
@@ -8,8 +9,9 @@ export interface TeammateWritePolicy {
     recursiveDelegation: "disabled";
 }
 export interface TeammateCapabilitySnapshot {
+    /** Static adapter contract, not a successful probe of the installed backend. */
+    evidence?: "adapter-contract";
     transport: TeammateAdapterContract["transport"];
-    nativeDelegationDisabled: true;
     supportsContinuation: true;
     supportsInterrupt: true;
     supportsCancel: true;
@@ -20,11 +22,7 @@ export interface TeammateCapabilitySnapshot {
     hostProof: {
         foregroundWait: true;
         protectedArtifactWrites: true;
-        protectedTargetsReadOnly: true;
-        gitStateReadOnly: true;
         attemptArtifactWrites: true;
-        nativeDelegationDisabled: true;
-        implicitMemoryDisabled: true;
         providerTransports: TeammateHostCapabilities["providerTransports"];
         providerOptions: Partial<TeammateHostCapabilities["providerOptions"]>;
         verifiedHostCap: number;
@@ -32,14 +30,19 @@ export interface TeammateCapabilitySnapshot {
     digest: string;
 }
 export interface TeammateLaunchSpec {
+    /** Absent on historical frozen plans. */
+    reportVersion?: 2;
     roleId: "teammate";
     provider: ResolvedTeammateProfile["provider"];
     profile?: string;
+    configuration: string;
     model?: string;
     reasoningEffort?: ResolvedTeammateProfile["reasoningEffort"];
     options: ResolvedTeammateProfile["options"];
     profileDigest?: string;
     prompt: string;
+    instructions: string;
+    context: string;
     rolePath: string;
     contextPaths: string[];
     contextManifests: string[];
@@ -47,6 +50,10 @@ export interface TeammateLaunchSpec {
     contextDigest: string;
     capability: TeammateCapabilitySnapshot;
 }
+export declare function parseFrozenTeammate(input: unknown): {
+    profile: ResolvedTeammateProfile;
+    launch: TeammateLaunchSpec;
+};
 export declare function buildTeammateLaunchSpec(input: {
     cwd: string;
     profile: ResolvedTeammateProfile;
@@ -55,4 +62,6 @@ export declare function buildTeammateLaunchSpec(input: {
     contextManifests?: string[];
     protectedTargets?: readonly string[];
 }): TeammateLaunchSpec;
+/** Frozen references must still name the same bytes when read by a worker. */
+export declare function assertTeammateContextCurrent(launch: TeammateLaunchSpec, cwd: string): void;
 //# sourceMappingURL=teammate-launch.d.ts.map

package/dist/commands/teamwork/teammate-launch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"teammate-launch.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-launch.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC9B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAE7D,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,WAAW,CAAC;IAC9B,QAAQ,EAAE,WAAW,CAAC;IACtB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,mBAAmB,EAAE,UAAU,CAAC;CACjC;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAChD,wBAAwB,EAAE,IAAI,CAAC;IAC/B,oBAAoB,EAAE,IAAI,CAAC;IAC3B,iBAAiB,EAAE,IAAI,CAAC;IACxB,cAAc,EAAE,IAAI,CAAC;IACrB,gBAAgB,EAAE,IAAI,CAAC;IACvB,eAAe,EAAE,IAAI,CAAC;IACtB,WAAW,EAAE,mBAAmB,CAAC;IACjC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,SAAS,EAAE;QACT,cAAc,EAAE,IAAI,CAAC;QACrB,uBAAuB,EAAE,IAAI,CAAC;QAC9B,wBAAwB,EAAE,IAAI,CAAC;QAC/B,gBAAgB,EAAE,IAAI,CAAC;QACvB,qBAAqB,EAAE,IAAI,CAAC;QAC5B,wBAAwB,EAAE,IAAI,CAAC;QAC/B,sBAAsB,EAAE,IAAI,CAAC;QAC7B,kBAAkB,EAAE,wBAAwB,CAAC,oBAAoB,CAAC,CAAC;QACnE,eAAe,EAAE,OAAO,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACtE,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC9C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;IAC7D,OAAO,EAAE,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,0BAA0B,CAAC;CACxC;AAsDD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,uBAAuB,CAAC;IACjC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC,GAAG,kBAAkB,CAkHrB"}
+{"version":3,"file":"teammate-launch.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-launch.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC9B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,eAAe,CAAC;AAEvB,gFAAgF;AAChF,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,WAAW,CAAC;IAC9B,QAAQ,EAAE,WAAW,CAAC;IACtB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,mBAAmB,EAAE,UAAU,CAAC;CACjC;AAED,MAAM,WAAW,0BAA0B;IACzC,gFAAgF;IAChF,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,SAAS,EAAE,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAChD,oBAAoB,EAAE,IAAI,CAAC;IAC3B,iBAAiB,EAAE,IAAI,CAAC;IACxB,cAAc,EAAE,IAAI,CAAC;IACrB,gBAAgB,EAAE,IAAI,CAAC;IACvB,eAAe,EAAE,IAAI,CAAC;IACtB,WAAW,EAAE,mBAAmB,CAAC;IACjC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,SAAS,EAAE;QACT,cAAc,EAAE,IAAI,CAAC;QACrB,uBAAuB,EAAE,IAAI,CAAC;QAC9B,qBAAqB,EAAE,IAAI,CAAC;QAC5B,kBAAkB,EAAE,wBAAwB,CAAC,oBAAoB,CAAC,CAAC;QACnE,eAAe,EAAE,OAAO,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACtE,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,yCAAyC;IACzC,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC9C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;IAC7D,OAAO,EAAE,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,0BAA0B,CAAC;CACxC;AA8DD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG;IACnD,OAAO,EAAE,uBAAuB,CAAC;IACjC,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CA8BA;AAmED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,uBAAuB,CAAC;IACjC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC,GAAG,kBAAkB,CAoHrB;AAED,8EAA8E;AAC9E,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,kBAAkB,EAC1B,GAAG,EAAE,MAAM,GACV,IAAI,CAoBN"}

package/dist/commands/teamwork/teammate-launch.js

@@ -1,8 +1,96 @@
 import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
+import { z } from "zod";
 import { assembleContext } from "./context-loader.js";
+import { resolveTrustedRoots } from "./context-trust.js";
+import { buildTeamworkInstructions } from "./prompt.js";
 import { assertTeammateHostCapability, getTeammateAdapter, } from "./teammate-adapters.js";
+import { frozenProfileSchema, } from "./profiles.js";
+const sha256 = z.string().regex(/^[a-f0-9]{64}$/);
+const frozenLaunchSchema = z
+    .object({
+    reportVersion: z.literal(2).optional(),
+    roleId: z.literal("teammate"),
+    provider: frozenProfileSchema.shape.provider,
+    profile: z.string().optional(),
+    configuration: frozenProfileSchema.shape.configuration,
+    model: z.string().optional(),
+    reasoningEffort: frozenProfileSchema.shape.reasoningEffort,
+    options: frozenProfileSchema.shape.options,
+    profileDigest: sha256.optional(),
+    prompt: z.string().max(256 * 1024),
+    instructions: z
+        .string()
+        .min(1)
+        .max(128 * 1024),
+    context: z.string().max(128 * 1024),
+    rolePath: z.string(),
+    contextPaths: z.array(z.string()),
+    contextManifests: z.array(z.string()),
+    roleDigest: sha256,
+    contextDigest: sha256,
+    capability: z
+        .object({
+        evidence: z.literal("adapter-contract").optional(),
+        transport: z.enum(["claude-cli", "codex-app-server", "acp"]),
+        supportsContinuation: z.literal(true),
+        supportsInterrupt: z.literal(true),
+        supportsCancel: z.literal(true),
+        supportsTerminal: z.literal(true),
+        supportsFailure: z.literal(true),
+        writePolicy: z
+            .object({
+            protectedTargets: z.literal("read-only"),
+            gitState: z.literal("read-only"),
+            attemptArtifacts: z.literal("write-only"),
+            nativeDelegation: z.literal("disabled"),
+            recursiveDelegation: z.literal("disabled"),
+        })
+            .strict(),
+        protectedTargets: z.array(z.string()),
+        hostProof: z
+            .object({
+            foregroundWait: z.literal(true),
+            protectedArtifactWrites: z.literal(true),
+            attemptArtifactWrites: z.literal(true),
+            providerTransports: z.array(z.enum(["claude-cli", "codex-app-server", "acp"])),
+            providerOptions: z.record(z.string(), z.array(z.string())),
+            verifiedHostCap: z.number().int().positive(),
+        })
+            .strict(),
+        digest: sha256,
+    })
+        .strict(),
+})
+    .strict();
+export function parseFrozenTeammate(input) {
+    const result = z
+        .object({ profile: frozenProfileSchema, launch: frozenLaunchSchema })
+        .strict()
+        .parse(input);
+    const { profile, launch } = result;
+    for (const field of [
+        "provider",
+        "model",
+        "profile",
+        "configuration",
+        "reasoningEffort",
+        "profileDigest",
+        "roleDigest",
+    ])
+        if (profile[field] !== launch[field])
+            throw new Error(`frozen execution ${field} does not match profile`);
+    if (canonical(profile.options) !== canonical(launch.options) ||
+        (launch.reportVersion === 2
+            ? buildTeamworkInstructions(profile.rolePrompt, "batch")
+            : profile.rolePrompt) !== launch.instructions)
+        throw new Error("frozen execution instructions or options do not match profile");
+    const { digest: expected, ...capability } = launch.capability;
+    if (hash(canonical(capability)) !== expected)
+        throw new Error("frozen capability digest does not match");
+    return result;
+}
 function hash(value) {
     return crypto.createHash("sha256").update(value).digest("hex");
 }
@@ -18,19 +106,26 @@ function canonical(value) {
     return JSON.stringify(value);
 }
 function requireRegularFile(cwd, candidate, field) {
-    const root = path.resolve(cwd);
-    const resolved = path.resolve(root, candidate);
-    const relative = path.relative(root, resolved);
-    if (relative.startsWith("..") || path.isAbsolute(relative))
-        throw new Error(`${field} must stay within the project root: ${candidate}`);
-    let current = root;
-    for (const part of relative.split(path.sep).filter(Boolean)) {
-        current = path.join(current, part);
-        if (!fs.existsSync(current))
-            throw new Error(`${field} is missing: ${candidate}`);
-        if (fs.lstatSync(current).isSymbolicLink())
-            throw new Error(`${field} must not contain symlinks: ${candidate}`);
+    const root = fs.realpathSync(cwd);
+    const absolute = path.resolve(cwd, candidate);
+    let checked = path.parse(absolute).root;
+    for (const segment of absolute.slice(checked.length).split(path.sep)) {
+        checked = path.join(checked, segment);
+        let stat;
+        try {
+            stat = fs.lstatSync(checked);
+        }
+        catch (error) {
+            if (error.code === "ENOENT")
+                throw new Error(`${field} is missing: ${candidate}`);
+            throw error;
+        }
+        if (stat.isSymbolicLink())
+            throw new Error(`${field} must not traverse a symlink: ${candidate}`);
     }
+    const resolved = fs.realpathSync(absolute);
+    if (![root, ...resolveTrustedRoots(cwd)].some((trusted) => resolved === trusted || resolved.startsWith(trusted + path.sep)))
+        throw new Error(`${field} must stay within the project root or explicitly trusted roots: ${candidate}`);
     const stat = fs.lstatSync(resolved);
     if (!stat.isFile())
         throw new Error(`${field} must be a regular file: ${candidate}`);
@@ -50,7 +145,7 @@ export function buildTeammateLaunchSpec(input) {
         requireRegularFile(input.cwd, file, "teammate context file");
     for (const manifest of contextManifests)
         requireRegularFile(input.cwd, manifest, "teammate context manifest");
-    const assembled = assembleContext(input.cwd, contextFiles, contextManifests);
+    const assembled = assembleContext(input.cwd, contextFiles, contextManifests, resolveTrustedRoots(input.cwd));
     for (const file of contextFiles)
         assertReturnedPath(assembled.paths, input.cwd, file, "teammate context file");
     for (const manifest of contextManifests) {
@@ -58,9 +153,7 @@ export function buildTeammateLaunchSpec(input) {
         if (!assembled.manifests.includes(normalized))
             throw new Error(`teammate context manifest was not recorded: ${manifest}`);
     }
-    const roleFile = requireRegularFile(input.cwd, input.profile.rolePath, "teammate role");
-    const roleBytes = fs.readFileSync(roleFile);
-    const roleDigest = hash(roleBytes);
+    const roleDigest = input.profile.roleDigest;
     const contextDigest = hash(assembled.paths
         .map((filePath) => `${filePath}\0${fs.readFileSync(path.resolve(input.cwd, filePath), "utf8")}`)
         .concat(assembled.manifests.map((manifest) => `manifest\0${manifest}\0${fs.readFileSync(path.resolve(input.cwd, manifest), "utf8")}`))
@@ -73,8 +166,8 @@ export function buildTeammateLaunchSpec(input) {
         recursiveDelegation: "disabled",
     };
     const capability = {
+        evidence: "adapter-contract",
         transport: adapter.transport,
-        nativeDelegationDisabled: true,
         supportsContinuation: true,
         supportsInterrupt: true,
         supportsCancel: true,
@@ -85,11 +178,7 @@ export function buildTeammateLaunchSpec(input) {
         hostProof: {
             foregroundWait: true,
             protectedArtifactWrites: true,
-            protectedTargetsReadOnly: true,
-            gitStateReadOnly: true,
             attemptArtifactWrites: true,
-            nativeDelegationDisabled: true,
-            implicitMemoryDisabled: true,
             providerTransports: [...input.host.providerTransports].sort(),
             providerOptions: Object.fromEntries(Object.entries(input.host.providerOptions).map(([provider, options]) => [provider, [...(options ?? [])].sort()])),
             verifiedHostCap: input.host.verifiedHostCap,
@@ -101,6 +190,8 @@ export function buildTeammateLaunchSpec(input) {
     };
     return {
         roleId: "teammate",
+        reportVersion: 2,
+        configuration: input.profile.configuration,
         provider: input.profile.provider,
         ...(input.profile.profile ? { profile: input.profile.profile } : {}),
         ...(input.profile.model ? { model: input.profile.model } : {}),
@@ -111,9 +202,14 @@ export function buildTeammateLaunchSpec(input) {
         ...(input.profile.profileDigest
             ? { profileDigest: input.profile.profileDigest }
             : {}),
-        prompt: [input.profile.rolePrompt, assembled.prompt]
+        prompt: [
+            buildTeamworkInstructions(input.profile.rolePrompt, "batch"),
+            assembled.prompt,
+        ]
             .filter(Boolean)
             .join("\n\n---\n\n"),
+        instructions: buildTeamworkInstructions(input.profile.rolePrompt, "batch"),
+        context: assembled.prompt,
         rolePath: input.profile.rolePath,
         contextPaths: assembled.paths,
         contextManifests: assembled.manifests,
@@ -122,4 +218,15 @@ export function buildTeammateLaunchSpec(input) {
         capability: capabilitySnapshot,
     };
 }
+/** Frozen references must still name the same bytes when read by a worker. */
+export function assertTeammateContextCurrent(launch, cwd) {
+    if (launch.reportVersion !== 2)
+        return;
+    const actual = hash(launch.contextPaths
+        .map((file) => `${file}\0${fs.readFileSync(requireRegularFile(cwd, file, "teammate context file"), "utf8")}`)
+        .concat(launch.contextManifests.map((manifest) => `manifest\0${manifest}\0${fs.readFileSync(requireRegularFile(cwd, manifest, "teammate context manifest"), "utf8")}`))
+        .join("\0"));
+    if (actual !== launch.contextDigest)
+        throw new Error("Frozen teammate context changed; construct a new plan before dispatch");
+}
 //# sourceMappingURL=teammate-launch.js.map

package/dist/commands/teamwork/teammate-launch.js.map

@@ -1 +1 @@
-{"version":3,"file":"teammate-launch.js","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-launch.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EACL,4BAA4B,EAC5B,kBAAkB,GAGnB,MAAM,wBAAwB,CAAC;AAqDhC,SAAS,IAAI,CAAC,KAAsB;IAClC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACvE,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC;aACxD,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;aACtC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;aACjE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,kBAAkB,CACzB,GAAW,EACX,SAAiB,EACjB,KAAa;IAEb,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/C,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,uCAAuC,SAAS,EAAE,CAAC,CAAC;IAC9E,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,gBAAgB,SAAS,EAAE,CAAC,CAAC;QACvD,IAAI,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,+BAA+B,SAAS,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,4BAA4B,SAAS,EAAE,CAAC,CAAC;IACnE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAe,EACf,GAAW,EACX,SAAiB,EACjB,KAAa;IAEb,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;IACpE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,gDAAgD,SAAS,EAAE,CACpE,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAOvC;IACC,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,4BAA4B,CAC1B,KAAK,CAAC,OAAO,CAAC,QAAQ,EACtB,KAAK,CAAC,IAAI,EACV,KAAK,CAAC,OAAO,CAAC,OAAO,CACtB,CAAC;IACF,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC;IAC9C,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC;IACtD,KAAK,MAAM,IAAI,IAAI,YAAY;QAC7B,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAAC;IAC/D,KAAK,MAAM,QAAQ,IAAI,gBAAgB;QACrC,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,2BAA2B,CAAC,CAAC;IAEvE,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAC7E,KAAK,MAAM,IAAI,IAAI,YAAY;QAC7B,kBAAkB,CAChB,SAAS,CAAC,KAAK,EACf,KAAK,CAAC,GAAG,EACT,IAAI,EACJ,uBAAuB,CACxB,CAAC;IACJ,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAC9B,KAAK,CAAC,GAAG,EACT,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAClC,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC3C,MAAM,IAAI,KAAK,CACb,+CAA+C,QAAQ,EAAE,CAC1D,CAAC;IACN,CAAC;IAED,MAAM,QAAQ,GAAG,kBAAkB,CACjC,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,OAAO,CAAC,QAAQ,EACtB,eAAe,CAChB,CAAC;IACF,MAAM,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,IAAI,CACxB,SAAS,CAAC,KAAK;SACZ,GAAG,CACF,CAAC,QAAQ,EAAE,EAAE,CACX,GAAG,QAAQ,KAAK,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,EAAE,CAC/E;SACA,MAAM,CACL,SAAS,CAAC,SAAS,CAAC,GAAG,CACrB,CAAC,QAAQ,EAAE,EAAE,CACX,aAAa,QAAQ,KAAK,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,EAAE,CACzF,CACF;SACA,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;IACF,MAAM,WAAW,GAAwB;QACvC,gBAAgB,EAAE,WAAW;QAC7B,QAAQ,EAAE,WAAW;QACrB,gBAAgB,EAAE,YAAY;QAC9B,gBAAgB,EAAE,UAAU;QAC5B,mBAAmB,EAAE,UAAU;KAChC,CAAC;IACF,MAAM,UAAU,GAAG;QACjB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,wBAAwB,EAAE,IAAa;QACvC,oBAAoB,EAAE,IAAa;QACnC,iBAAiB,EAAE,IAAa;QAChC,cAAc,EAAE,IAAa;QAC7B,gBAAgB,EAAE,IAAa;QAC/B,eAAe,EAAE,IAAa;QAC9B,WAAW;QACX,gBAAgB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;QAC5D,SAAS,EAAE;YACT,cAAc,EAAE,IAAa;YAC7B,uBAAuB,EAAE,IAAa;YACtC,wBAAwB,EAAE,IAAa;YACvC,gBAAgB,EAAE,IAAa;YAC/B,qBAAqB,EAAE,IAAa;YACpC,wBAAwB,EAAE,IAAa;YACvC,sBAAsB,EAAE,IAAa;YACrC,kBAAkB,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,EAAE;YAC7D,eAAe,EAAE,MAAM,CAAC,WAAW,CACjC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAC5C,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CACjE,CACF;YACD,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe;SAC5C;KACF,CAAC;IACF,MAAM,kBAAkB,GAA+B;QACrD,GAAG,UAAU;QACb,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;KACpC,CAAC;IACF,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ;QAChC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe;YAC/B,CAAC,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE;YACpD,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO;QAC9B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa;YAC7B,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE;YAChD,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC;aACjD,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,aAAa,CAAC;QACtB,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ;QAChC,YAAY,EAAE,SAAS,CAAC,KAAK;QAC7B,gBAAgB,EAAE,SAAS,CAAC,SAAS;QACrC,UAAU;QACV,aAAa;QACb,UAAU,EAAE,kBAAkB;KAC/B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"teammate-launch.js","sourceRoot":"","sources":["../../../src/commands/teamwork/teammate-launch.ts"],"names":[],"mappings":"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"}

package/dist/commands/teamwork/wait.d.ts

@@ -10,6 +10,8 @@ export interface WaitOptions {
     includeProgress?: boolean;
     /** Wait until every agent in --from has produced a matching event. */
     all?: boolean;
+    /** One normalized final result, including content validation and input identity. */
+    json?: boolean;
 }
 export declare function teamworkSessionWait(sessionId: string, opts: WaitOptions): Promise<void>;
 /** Parse a duration like "30s", "2m", "1h" into milliseconds. */

package/dist/commands/teamwork/wait.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/wait.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sEAAsE;IACtE,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAID,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,IAAI,CAAC,CAiDf;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAmBvE"}
+{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/wait.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sEAAsE;IACtE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,oFAAoF;IACpF,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAID,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,IAAI,CAAC,CAwGf;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAmBvE"}

package/dist/commands/teamwork/wait.js

@@ -1,4 +1,5 @@
-import { parseTeamworkEventKinds } from "./store/events.js";
+import { parseTeamworkEventKinds, readTeamworkEvents } from "./store/events.js";
+import { buildInteractiveResult } from "./result.js";
 import { resolveExistingTeamworkSession } from "./store/paths.js";
 import { normalizeThreadKey, parseCsv, parseTeamworkSessionScope, parseThreadAction, } from "./store/schema.js";
 import { watchEvents } from "./store/watch.js";
@@ -8,13 +9,24 @@ export async function teamworkSessionWait(sessionId, opts) {
         scope: parseTeamworkSessionScope(opts.scope),
     });
     const fromList = parseCsv(opts.from);
+    const resultWorker = fromList?.[0];
+    if (opts.json &&
+        (fromList?.length !== 1 ||
+            opts.all ||
+            opts.kind ||
+            opts.thread ||
+            opts.action ||
+            opts.includeProgress))
+        throw new Error("--json requires exactly one --from worker and no event-kind, thread, action, progress or --all filter");
     if (opts.all && (!fromList || fromList.length === 0)) {
         throw new Error("--all requires --from <a,b,...>");
     }
     const filter = {
         self: opts.as,
-        from: fromList,
-        kind: parseTeamworkEventKinds(opts.kind),
+        from: opts.json ? undefined : fromList,
+        kind: opts.json
+            ? ["turn_finished", "error", "killed"]
+            : parseTeamworkEventKinds(opts.kind),
         to: opts.to ?? opts.as, // default: broadcasts to me + explicit-to-me
         thread: opts.thread ? normalizeThreadKey(opts.thread) : undefined,
         action: opts.action ? parseThreadAction(opts.action) : undefined,
@@ -32,6 +44,20 @@ export async function teamworkSessionWait(sessionId, opts) {
             signal: abort.signal,
             project: ref.project,
         })) {
+            if (opts.json) {
+                if (!resultWorker)
+                    throw new Error("Missing result worker");
+                const worker = resultWorker;
+                if (ev.by !== worker && ev.by !== `supervisor:${worker}`)
+                    continue;
+                const result = buildInteractiveResult(sessionId, worker, ev, await readTeamworkEvents(sessionId, ref.project));
+                console.log(JSON.stringify(result));
+                if (result.execution.status !== "completed" ||
+                    result.reports.some((item) => item.validation !== "passed" ||
+                        item.report?.status !== "complete"))
+                    process.exitCode = 1;
+                return;
+            }
             console.log(JSON.stringify(ev));
             if (!pending)
                 return;
@@ -44,6 +70,21 @@ export async function teamworkSessionWait(sessionId, opts) {
             process.stderr.write(`timeout: still waiting on ${[...pending].join(",")}\n`);
         }
         process.exitCode = TIMEOUT_EXIT_CODE;
+        if (opts.json)
+            console.log(JSON.stringify({
+                schemaVersion: 1,
+                kind: "trellis_result",
+                mode: "interactive",
+                association: { sessionId, worker: resultWorker },
+                execution: {
+                    status: "timeout",
+                    stopped: false,
+                    reason: "Wait deadline elapsed; the persistent worker remains owned by the session",
+                },
+                reports: [],
+                semanticValidation: "not_run",
+                disposition: "not_applicable",
+            }));
     }
     finally {
         if (timer)

package/dist/commands/teamwork/wait.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/teamwork/wait.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/teamwork/wait.ts"],"names":[],"mappings":"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"}

package/dist/commands/uninstall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uninstall.d.ts","sourceRoot":"","sources":["../../src/commands/uninstall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAwBH,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AA2ED;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAwBnE;AAOD;;GAEG;AACH,wBAAsB,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0I7E"}
+{"version":3,"file":"uninstall.d.ts","sourceRoot":"","sources":["../../src/commands/uninstall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA4BH,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AA2ED;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAwBnE;AAOD;;GAEG;AACH,wBAAsB,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2J7E"}