snipara-companion 3.7.2 → 3.7.4

package/CHANGELOG.md

@@ -2,8 +2,22 @@
 
 Release notes for `snipara-companion`, newest first.
 
+## 3.7.4
+
+- Fix hosted workflow session creation by separating logical workflow identity from the server-issued session ID. Reuse persisted IDs for claims and release, scope mappings by project, actor and worktree, and skip hosted claims when session creation fails.
+- Cover session creation, repeated starts, distinct workflows/actors, refusal and lease release.
+
 ## Unreleased
 
+## New In 3.7.3
+
+- Restores source-bound Controller return projection for exact runtime context:
+  re-reads the bound context map, checks its hash and version, and reconstructs
+  the complete bridge identity. Verifies the Controller task context while
+  accepting Python's null representation of an omitted optional target attempt.
+  Regression qualification covers the corrected 3.7.2 candidate and the 3.7.3
+  release artifact; public round-trip tests assert the selected CLI version.
+
 ## New In 3.7.2
 
 - Bundles the ESM-only runtime dependency graphs for the CommonJS Node 18

package/dist/index.d.ts

@@ -3985,6 +3985,7 @@ interface CollaborationReviewOnlyAcknowledgement {
     expiresAt: string;
 }
 interface CollaborationLocalState {
+    workflowSessions?: Record<string, string>;
     schemaVersion: "snipara.collaboration.v1";
     updatedAt: string;
     workSessionId?: string;

package/dist/index.js

@@ -21495,6 +21495,9 @@ function loadCollaborationState(rootDir = process.cwd()) {
     schemaVersion: "snipara.collaboration.v1",
     updatedAt: typeof parsed.updatedAt === "string" ? parsed.updatedAt : (/* @__PURE__ */ new Date()).toISOString(),
     workSessionId: normalizeOptionalString3(parsed.workSessionId),
+    workflowSessions: Object.fromEntries(Object.entries(parsed.workflowSessions ?? {}).filter(
+      ([key, value]) => /^[a-f0-9]{64}$/.test(key) && typeof value === "string" && value.length > 0
+    )),
     sessionId: normalizeOptionalString3(parsed.sessionId),
     actorId: normalizeOptionalString3(parsed.actorId),
     actorType: normalizeActorType(parsed.actorType),
@@ -21723,26 +21726,32 @@ async function collaborationClaimCommand(options) {
 }
 async function workflowCollaborationStart(options) {
   const rootDir = path25.resolve(options.rootDir ?? process.cwd());
-  const workSessionId = workflowWorkSessionId(options.workflowId);
+  const logicalSessionId = workflowWorkSessionId(options.workflowId);
   const context = resolveCollaborationContext({
     dir: rootDir,
-    workSessionId,
     client: "snipara-companion:workflow"
   });
   const state = loadCollaborationState(rootDir);
+  const sessionKey = workflowSessionKey(context, options.workflowId);
+  const persistedSessionId = state.workflowSessions?.[sessionKey];
+  context.actor.sessionId = `${logicalSessionId}:${sessionKey}`;
   const files = normalizeCollaborationFiles(options.files);
   const resources = deriveLocalCollaborationResourcesFromFiles(files, rootDir);
   const hostedSession = await maybeStartHostedSession(context, {
-    workSessionId,
+    workSessionId: persistedSessionId,
     task: options.goal,
     files,
     resources
   });
   const session = hostedSession.status === "ok" ? hostedSession.data?.session : void 0;
+  const workSessionId = session?.id ?? persistedSessionId ?? logicalSessionId;
+  if (session) {
+    state.workflowSessions = { ...state.workflowSessions, [sessionKey]: session.id };
+  }
   const effectiveResources = hostedSession.status === "ok" ? hostedSession.data?.resources ?? resources : resources;
   let hostedClaim = { status: "skipped" };
   const shouldClaim = options.mode === "full" || options.mode === "orchestrate";
-  if (shouldClaim && (files.length > 0 || effectiveResources.length > 0)) {
+  if (hostedSession.status === "ok" && shouldClaim && (files.length > 0 || effectiveResources.length > 0)) {
     hostedClaim = await maybeCreateHostedLeases(context, {
       workSessionId,
       files,
@@ -21800,7 +21809,7 @@ async function workflowCollaborationRelease(options) {
     client: "snipara-companion:workflow"
   });
   const state = loadCollaborationState(rootDir);
-  const targetSessionId = options.workflowId ? workflowWorkSessionId(options.workflowId) : state.workSessionId;
+  const targetSessionId = options.workflowId ? state.workflowSessions?.[workflowSessionKey(context, options.workflowId)] ?? workflowWorkSessionId(options.workflowId) : state.workSessionId;
   const activeLeases = state.leases.filter(
     (lease) => lease.status === "ACTIVE" && (lease.workSessionId === targetSessionId || !lease.workSessionId && Boolean(targetSessionId) && state.workSessionId === targetSessionId)
   );
@@ -22767,6 +22776,9 @@ function expireLocalLeases(state, now = /* @__PURE__ */ new Date()) {
     state.updatedAt = now.toISOString();
   }
 }
+function workflowSessionKey(context, workflowId) {
+  return (0, import_node_crypto13.createHash)("sha256").update(JSON.stringify([context.config.apiUrl, context.config.projectId, context.actor.actorType, context.actor.actorId, context.worktree, workflowId])).digest("hex");
+}
 function workflowWorkSessionId(workflowId) {
   return `workflow:${workflowId}`;
 }
@@ -44556,6 +44568,16 @@ function projectControllerBridge(options) {
     throw new Error("Unsupported bridge artifact schema or authority");
   if (artifact2.taskContextVersion != null && artifact2.taskContextVersion !== "source-context-v1")
     throw new Error("Unsupported task context version");
+  const hasRuntimeContext = "runtimeSourceContextVersion" in artifact2 || "sourceRuntimeContext" in artifact2;
+  let runtimeRef;
+  let runtimeSource;
+  if (hasRuntimeContext) {
+    if (artifact2.runtimeSourceContextVersion !== "runtime-source-context-v1")
+      throw new Error("Unsupported runtime source context version");
+    runtimeRef = object2(artifact2.sourceRuntimeContext);
+    runtimeSource = source(cwd, runtimeRef.path);
+    same(runtimeSource.hash, runtimeRef.sha256, "runtime context source hash");
+  }
   const leadRef = object2(artifact2.sourceLeadPlan);
   const policyRef = object2(artifact2.sourcePolicy);
   const workflowRef = object2(artifact2.workflowPlan);
@@ -44563,6 +44585,7 @@ function projectControllerBridge(options) {
     {
       leadPlanFile: String(leadRef.path),
       policyFile: String(policyRef.path),
+      ...runtimeRef ? { taskContextFile: String(runtimeRef.path) } : {},
       reviewerId: bridgeId(object2(artifact2.review).reviewedBy),
       outDir: path42.relative(
         cwd,
@@ -44582,6 +44605,10 @@ function projectControllerBridge(options) {
   same(workflow2.hash, workflowRef.sha256, "workflow source hash");
   const identity = {
     ...artifact2.taskContextVersion ? { taskContextVersion: artifact2.taskContextVersion } : {},
+    ...runtimeRef ? {
+      runtimeSourceContextVersion: artifact2.runtimeSourceContextVersion,
+      sourceRuntimeContext: runtimeRef
+    } : {},
     sourceLeadPlan: leadRef,
     sourcePolicy: policyRef,
     controllerId: artifact2.controllerId,
@@ -44645,6 +44672,8 @@ function projectControllerBridge(options) {
     { kind: "workflow_plan", id: String(workflowRef.path), sha256: workflow2.hash },
     { kind: "controller", id: controllerId, sha256: stateRead.hash }
   ];
+  if (runtimeRef && runtimeSource)
+    sourceHashes.push({ kind: "runtime_context", id: String(runtimeRef.path), sha256: runtimeSource.hash });
   const acceptedProposals = /* @__PURE__ */ new Map();
   const tasks = mappings.map((mapping) => {
     const taskId = bridgeId(mapping.taskId);
@@ -44665,6 +44694,13 @@ function projectControllerBridge(options) {
       "effectScope"
     ])
       same(actual[key], expected[key], `task ${key}`);
+    if (expected.sourceContext != null || actual.sourceContext != null) {
+      const expectedContext = object2(expected.sourceContext);
+      const actualContext = { ...object2(actual.sourceContext) };
+      if (expectedContext.targetAttempt === void 0 && actualContext.targetAttempt === null)
+        delete actualContext.targetAttempt;
+      same(actualContext, expectedContext, "task sourceContext");
+    }
     same(expected.runtimeProfileId, mapping.runtimeProfileId, "runtime profile binding");
     const reportedStatus = String(actual.status);
     let proposalId = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snipara-companion",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "Local-first CLI that asks your repo what breaks before an AI coding agent edits it.",
   "main": "dist/index.js",
   "bin": {