@ran-sh/dsh-crew 0.4.0 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ran-sh/dsh-crew",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "main": "./src/hub/entry.mjs",
   "bin": {

package/src/hub/index.mjs

@@ -297,8 +297,14 @@ export class WorkerRegistry {  constructor(ctx) {
       result: null, error: null, stopReason: null, handle: null, waiters: [],
       delivery_complete: false, delivery_missing: [], delivery_metadata: null,
       outcome: null,
-      lastAssistantText: null,
-    };
+      lastAssistantText: null, handle_dispose_promise: null, disposeHandle: null,
+    };
+    const disposeJobHandle = async () => {
+      if (!job.handle) return;
+      job.handle_dispose_promise ??= Promise.resolve().then(() => job.handle.dispose());
+      await job.handle_dispose_promise;
+    };
+    job.disposeHandle = disposeJobHandle;
     // Read-only pre-run snapshot (async, never blocks dispatch): the audit
     // only needs the before-state by the time the worker finishes. Non-repos
     // degrade to { kind:'no-git' } instead of failing the job.
@@ -386,7 +392,10 @@ export class WorkerRegistry {  constructor(ctx) {
         job.endedAt = new Date().toISOString();
         this.publish();
         for (const waiter of job.waiters.splice(0)) waiter();
-        try { await job.handle?.dispose(); } catch {}
+        try { await disposeJobHandle(); } catch (error) {
+          job.cleanup_warning = `agent cleanup failed: ${error?.message ?? String(error)}`;
+          this.publish();
+        }
       }, timeoutMs);
       job.timeoutHandle.unref?.();
     }
@@ -394,11 +403,15 @@ export class WorkerRegistry {  constructor(ctx) {
       .catch((err) => {
         if (job.status === 'running') job.status = 'failed';
         job.error = job.error ?? (err?.message ?? String(err));
-      })
+      })
       .finally(async () => {
         if (job.timeoutHandle) clearTimeout(job.timeoutHandle);
-        job.endedAt = new Date().toISOString();
-        job.currentTool = null;
+        job.endedAt = new Date().toISOString();
+        job.currentTool = null;
+        let handleCleanupWarning = job.cleanup_warning ?? null;
+        try { await disposeJobHandle(); } catch (error) {
+          handleCleanupWarning = `agent cleanup failed: ${error?.message ?? String(error)}`;
+        }
         // Delivery completeness is separate from execution status: a job can
         // be done yet fail to report Diff/Tests/Risks (or Review sections for
         // an automatic review). Parse whatever final message the worker
@@ -446,7 +459,10 @@ export class WorkerRegistry {  constructor(ctx) {
         if (job.isolatedWorkspace) {
           const cleanup = await cleanupIsolatedWorkspace(job.isolatedWorkspace).catch((error) => ({ ok: false, error: error?.message ?? String(error) }));
           job.workspace_retained = cleanup.ok !== true;
-          job.cleanup_warning = cleanup.ok === true ? null : cleanup.error ?? 'worktree cleanup failed';
+          const workspaceCleanupWarning = cleanup.ok === true ? null : cleanup.error ?? 'worktree cleanup failed';
+          job.cleanup_warning = [handleCleanupWarning, workspaceCleanupWarning].filter(Boolean).join('; ') || null;
+        } else {
+          job.cleanup_warning = handleCleanupWarning;
         }
         this.publish();
         for (const w of job.waiters.splice(0)) w();
@@ -467,24 +483,30 @@ export class WorkerRegistry {  constructor(ctx) {
     return job;
   }
 
-  async cancel(id) {
+  async cancel(id) {
     const job = this.jobs.get(id);
     if (!job) return undefined;
     if (job.status === 'running') {
       job.status = 'cancelled';
       job.phase = JOB_PHASES.CANCELLED;
       job.error = 'cancelled by request';
-      try { await job.handle?.dispose(); } catch {}
+      try { await job.disposeHandle?.(); } catch (error) {
+        job.cleanup_warning = `agent cleanup failed: ${error?.message ?? String(error)}`;
+      }
       this.publish();
     }
     return job;
   }
 
-  async dispose() {
-    for (const job of this.jobs.values()) {
-      if (job.status === 'running') { try { await job.handle?.dispose(); } catch {} }
-    }
-  }
+  async dispose() {
+    for (const job of this.jobs.values()) {
+      if (job.status === 'running') {
+        try { await job.disposeHandle?.(); } catch (error) {
+          job.cleanup_warning = `agent cleanup failed: ${error?.message ?? String(error)}`;
+        }
+      }
+    }
+  }
 }
 
 // ---------- loopback route helpers (pattern from dsh-noema) ----------

package/src/job-contracts.mjs

@@ -87,15 +87,20 @@ function compactSelectionTrace(attempts) {
   if (!Array.isArray(attempts)) return [];
   return attempts.slice(0, 16).map((attempt) => {
     const trace = attempt?.selection_trace ?? {};
-    const selected = trace.selected ?? (
+    const rawSelected = trace.selected ?? (
       attempt?.provider || attempt?.model
         ? { provider: attempt?.provider ?? null, model: attempt?.model ?? null, source: attempt?.selection_source ?? null }
         : null
     );
+    const selected = rawSelected ? {
+      provider: boundedText(rawSelected.provider, 200),
+      model: boundedText(rawSelected.model, 300),
+      source: boundedText(rawSelected.source, 100),
+    } : null;
     const candidates = Array.isArray(trace.ordered_candidates)
       ? trace.ordered_candidates.slice(0, 32).map((candidate) => ({
-        model: candidate?.model ?? null,
-        provider: candidate?.provider ?? null,
+        model: boundedText(candidate?.model, 300),
+        provider: boundedText(candidate?.provider, 200),
         status: String(candidate?.status ?? 'CANDIDATE').toUpperCase(),
         ...(candidate?.reason ? { reason: boundedText(candidate.reason, 200) } : {}),
       }))
@@ -107,9 +112,9 @@ function compactSelectionTrace(attempts) {
       selected_model: selected?.model ?? null,
       candidates,
       fallback_chain: trace.fallback_reason ? [boundedText(trace.fallback_reason, 200)] : [],
-      decision_reason: selected?.source ?? attempt?.selection_source ?? null,
-      fallback_reason: trace.fallback_reason ?? null,
-      escalation_reason: trace.escalation_reason ?? null,
+      decision_reason: boundedText(selected?.source ?? attempt?.selection_source, 200),
+      fallback_reason: boundedText(trace.fallback_reason, 200),
+      escalation_reason: boundedText(trace.escalation_reason, 200),
     };
   });
 }
@@ -140,6 +145,9 @@ export function buildEvidenceEnvelope(view = {}) {
   const errorMessage = boundedText(view.error, 1000);
   const changedFiles = boundedStrings(changedFilesFromView(view), { count: 120, length: 500 });
   const status = evidenceStatus(view);
+  const selectionAttempts = Array.isArray(view.child_attempts) && view.child_attempts.length > 0
+    ? view.child_attempts
+    : (view.selection_trace || view.provider || view.model ? [view] : []);
   return {
     schema_version: JOB_CONTRACT_SCHEMA_VERSION,
     job_id: view.id ?? null,
@@ -154,7 +162,7 @@ export function buildEvidenceEnvelope(view = {}) {
       delivery_complete: outcome.delivery?.complete === true,
       review_verdict: review?.verdict ?? null,
     },
-    selection_trace: compactSelectionTrace(view.child_attempts),
+    selection_trace: compactSelectionTrace(selectionAttempts),
     changed_files: changedFiles,
     changes: boundedStrings(outcome.changes),
     tests: boundedTests(outcome.tests),
@@ -202,6 +210,8 @@ export function projectWorkflowView(view, { detail = 'compact', afterSequence =
     review: _review,
     events: _legacyEvents,
     child_attempts: _childAttempts,
+    selection_trace: _rawSelectionTrace,
+    selection_source: _rawSelectionSource,
     result: _rawResult,
     workspace_diff: _workspaceDiff,
     reasonDetail: _reasonDetail,

package/src/runtime-identity.mjs

@@ -8,7 +8,7 @@
 // Keep this module pure and dependency-free so Hub, MCP and tests all use the
 // exact same compatibility rules.
 
-export const RUNTIME_VERSION = '0.4.0';
+export const RUNTIME_VERSION = '0.4.1';
 export const HUB_PROTOCOL_VERSION = 1;
 
 export const HUB_CAPABILITIES = Object.freeze([