@brainervirus/workit-opencode 8.9.0 → 8.9.1

package/dist/plugin.js

@@ -10564,6 +10564,38 @@ var isNewerVersion = (candidate, current) => {
   return false;
 };
 var validId = (value) => /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(value);
+var readText = (file) => {
+  try {
+    return fs7.readFileSync(file, "utf8");
+  } catch {
+    return "";
+  }
+};
+var REFLOG_LINE = /^[0-9a-f]+ ([0-9a-f]+) .* (\d+) [+-]\d{4}\t(.*)$/u;
+var branchStart = (location, branch, aliases) => {
+  const first = readText(path6.join(path6.dirname(location.dir), "logs", "refs", "heads", branch)).split(`
+`, 1)[0];
+  const created = REFLOG_LINE.exec(first);
+  const start = created && /^branch: Created from (\S+)$/u.exec(created[3])?.[1];
+  if (!created || !start)
+    return null;
+  if (start !== "HEAD")
+    return start;
+  if (!location.git)
+    return null;
+  for (const line of readText(path6.join(location.git.gitDir, "logs", "HEAD")).split(`
+`)) {
+    const entry = REFLOG_LINE.exec(line);
+    const moved = entry && /^checkout: moving from (\S+) to (\S+)$/u.exec(entry[3]);
+    const seconds = entry ? Number(entry[2]) - Number(created[2]) : -1;
+    if (moved && entry[1] === created[1] && seconds >= 0 && seconds <= 1 && aliases.includes(moved[2]))
+      return moved[1];
+  }
+  return null;
+};
+var refExists = (common, ref) => fs7.existsSync(path6.join(common, ref)) || readText(path6.join(common, "packed-refs")).includes(` ${ref}
+`);
+var origins = new Map;
 var sameDirectoryIdentity = (left, right) => {
   if (!path6.isAbsolute(left) || !path6.isAbsolute(right))
     return false;
@@ -10816,6 +10848,66 @@ class TaskStore {
       return bound;
     return success(null, null, { key: key.data, bound: bound.data });
   }
+  taskForWorker(workerId) {
+    if (typeof workerId !== "string" || !validId(workerId))
+      return failure2("invalid_input", "needs a worker id: `workit worker cancel|report <workerId>`");
+    const listed = this.listTaskIndex();
+    if (!listed.ok)
+      return listed;
+    for (const entry of listed.data) {
+      if (entry.status === "closed")
+        continue;
+      const loaded = this.load(entry.id);
+      if (!loaded.ok)
+        return loaded;
+      if (loaded.data?.record.workers.some((worker) => worker.id === workerId))
+        return success(null, null, entry.id);
+    }
+    return success(null, null, null);
+  }
+  originTaskEntry() {
+    const key = this.currentKey();
+    const location = this.location();
+    const branch = key.ok ? key.data.branch : null;
+    if (!branch || !location.ok)
+      return success(null, null, null);
+    const common = path6.dirname(location.data.dir);
+    const heads = path6.join(common, "logs", "refs", "heads");
+    const headLog = location.data.git ? path6.join(location.data.git.gitDir, "logs", "HEAD") : "";
+    const signatures = [
+      path6.join(heads, branch),
+      headLog,
+      heads,
+      path6.join(common, "packed-refs")
+    ].map((file) => fileSignature(file) ?? "-");
+    const slot = `${location.data.dir}\x00${headLog}\x00${branch}`;
+    let resolved = origins.get(slot);
+    if (resolved?.signature !== signatures.join("|")) {
+      const renames = branchRenames(location.data);
+      const aliases = [branch];
+      for (const rename of renames.toReversed())
+        if (rename.to === aliases.at(-1))
+          aliases.push(rename.from);
+      const start = branchStart(location.data, branch, aliases);
+      const slash = start?.indexOf("/") ?? -1;
+      const remote = slash > 0 && !refExists(common, `refs/heads/${start}`) && (refExists(common, `refs/remotes/${start}`) || readText(path6.join(common, "config")).includes(`[remote "${start.slice(0, slash)}"]`));
+      const name = start && (remote ? start.slice(slash + 1) : start);
+      resolved = {
+        signature: signatures.join("|"),
+        name: name && !aliases.includes(name) ? name : null,
+        renames
+      };
+      origins.set(slot, resolved);
+    }
+    const entry = resolved.name ? this.openTasksForKey(resolved.name, resolved.renames) : null;
+    if (entry && !entry.ok)
+      return entry;
+    return success(null, null, entry?.data[0] ? { origin: `branch ${resolved.name}`, entry: entry.data[0] } : null);
+  }
+  readStoreTask(taskId) {
+    const loaded = this.load(taskId);
+    return loaded.ok ? success(null, null, loaded.data?.record ?? null) : loaded;
+  }
   create(input, provenance, expectedWorkspaceRevision) {
     const value = "intent" in input ? input : {
       intent: input,
@@ -11485,12 +11577,12 @@ class TaskStore {
       return 0;
     }
   }
-  openTasksForKey(key) {
+  openTasksForKey(key, known) {
     const all = this.listStoreIndex();
     if (!all.ok)
       return all;
-    const location = this.location();
-    const renames = location.ok ? branchRenames(location.data) : [];
+    const location = known ? null : this.location();
+    const renames = known ?? (location?.ok ? branchRenames(location.data) : []);
     return success(null, null, all.data.filter((entry) => entry.key !== null && entry.status !== "closed").filter((entry) => (renames.length ? followRenames(entry.key, entry.boundAt ?? entry.createdAt, renames) : entry.key) === key).toSorted(oldestFirst));
   }
   openTaskForKey(key) {
@@ -15687,38 +15779,45 @@ var compactReference = (ref) => {
     };
   return { kind: ref.kind };
 };
-function compactTaskContext(view) {
-  const decisions = view.task.decisions.slice().toSorted((left, right) => {
-    const leftAt = compactTimestamp(left.recordedAt);
-    const rightAt = compactTimestamp(right.recordedAt);
-    if (leftAt !== rightAt)
-      return leftAt > rightAt ? -1 : 1;
-    return left.id < right.id ? -1 : left.id > right.id ? 1 : 0;
-  }).slice(0, COMPACT_MAX_ITEMS).map((entry) => ({
-    id: entry.id,
-    purpose: entry.data.purpose,
-    status: entry.data.response,
-    digest: entry.data.digest,
-    choice: compactDecisionChoice(entry) || `task.inspect taskId=${view.task.id} view=full; decision=${entry.id}`,
-    references: entry.data.binding.contentRefs.slice(0, 1).map(compactReference)
-  }));
-  const methods = view.task.policy ? selectMethods(view.task.policy, view.capabilities).map((method) => ({
+var newestDecisionFirst = (left, right) => {
+  const leftAt = compactTimestamp(left.recordedAt);
+  const rightAt = compactTimestamp(right.recordedAt);
+  if (leftAt !== rightAt)
+    return leftAt > rightAt ? -1 : 1;
+  return left.id < right.id ? -1 : left.id > right.id ? 1 : 0;
+};
+var compactDecisions = (sources) => sources.flatMap((source) => source ? source.decisions.toSorted(newestDecisionFirst).map((entry) => ({
+  id: entry.id,
+  purpose: entry.data.purpose,
+  status: entry.data.response,
+  digest: entry.data.digest,
+  choice: compactDecisionChoice(entry) || `task.inspect taskId=${source.taskId} view=full; decision=${entry.id}`,
+  references: entry.data.binding.contentRefs.slice(0, 1).map(compactReference),
+  origin: source.origin ?? undefined
+})) : []).slice(0, COMPACT_MAX_ITEMS);
+function compactTaskContext(view, inherited = null) {
+  const decisions = compactDecisions([
+    view && { origin: null, taskId: view.task.id, decisions: view.task.decisions },
+    inherited
+  ]);
+  const methods = view?.task.policy ? selectMethods(view.task.policy, view.capabilities).map((method) => ({
     id: method.id,
     assurance: method.assurance,
     reason: compactText(method.reason, COMPACT_TEXT_BYTES) ?? ""
   })) : [];
+  const stale = view?.evidence.filter((entry) => entry.status === "stale").length;
   const gaps = Array.from(new Set([
-    ...view.evidence.filter((entry) => entry.status === "stale").map((entry) => `stale evidence: ${entry.evidenceId}`),
-    ...view.requirements.filter((entry) => entry.status !== "satisfied").map((entry) => entry.reason),
-    ...view.task.progress.blockers.map((entry) => entry.reason)
+    ...stale ? [`stale evidence: ${stale}; workit task inspect --task ${view.task.id} --view full`] : [],
+    ...(view?.requirements ?? []).filter((entry) => entry.status !== "satisfied").map((entry) => entry.reason),
+    ...(view?.task.progress.blockers ?? []).map((entry) => entry.reason)
   ])).toSorted().slice(0, COMPACT_MAX_ITEMS).map((gap) => compactText(gap, COMPACT_TEXT_BYTES));
   const context = {
-    objective: compactText(view.task.intent.data.objective, COMPACT_TEXT_BYTES) ?? "",
-    status: view.task.status,
+    objective: view ? compactText(view.task.intent.data.objective, COMPACT_TEXT_BYTES) ?? "" : "no task on this branch yet",
+    status: view?.task.status ?? null,
     decisions,
     methods,
     gaps,
-    nextAction: compactText(view.task.progress.nextAction, COMPACT_TEXT_BYTES)
+    nextAction: compactText(view?.task.progress.nextAction ?? null, COMPACT_TEXT_BYTES)
   };
   let encoded = JSON.stringify(context);
   while (compactBytes(encoded) > COMPACT_MAX_BYTES && (context.decisions.length || context.methods.length || context.gaps.length)) {
@@ -16461,6 +16560,13 @@ var TASK_SCOPED_ACTIONS = new Set([
   "worker.cancel",
   "state.export"
 ]);
+var WORKER_ADDRESSED_ACTIONS = new Set(["worker.cancel", "worker.report"]);
+var workerCommand = (taskId, request) => {
+  const { action, workerId, reason, report } = request;
+  const rest = JSON.stringify({ reason, report });
+  const payload = rest === "{}" ? "" : ` --payload '${rest.replace(/'/gu, "'\\''")}'`;
+  return `workit worker ${String(action)} ${String(workerId)} --task ${taskId}${payload}`;
+};
 var CREATING_ACTIONS = new Set([
   "task.revise",
   "task.progress",
@@ -16711,6 +16817,17 @@ class WorkitCore {
     const root = this.contextRootError();
     if (!root.ok)
       return root;
+    const addressed = WORKER_ADDRESSED_ACTIONS.has(action);
+    const workerId = addressed ? value.workerId : this.context.workerId ?? null;
+    if (workerId !== null) {
+      const owner = this.store.taskForWorker(workerId);
+      if (!owner.ok)
+        return owner;
+      if (owner.data)
+        return success(null, null, { ...request, taskId: owner.data });
+      if (addressed)
+        return failure2("not_found", `worker ${workerId} is on no open task; find its task with \`workit task status --all\`, then run \`${workerCommand("<task-id>", request)}\``);
+    }
     const create = CREATING_ACTIONS.has(action) && (this.context.workerId ?? null) === null;
     const found = this.store.implicitTask({
       provenance: provenance(this.context),
@@ -17417,7 +17534,9 @@ class WorkitCore {
     if (!resolved.ok)
       return resolved;
     const value = resolved.data;
-    return this.retryOmittedRevisions(value, () => this.workerOnce(value));
+    const result = this.retryOmittedRevisions(value, () => this.workerOnce(value));
+    const { action, taskId } = value ?? {};
+    return result.ok || request?.taskId !== undefined || typeof taskId !== "string" || !WORKER_ADDRESSED_ACTIONS.has(`worker.${String(action)}`) ? result : { ...result, error: `${result.error}; run \`${workerCommand(taskId, value)}\`` };
   }
   workerOnce(request) {
     const root = this.contextRootError();
@@ -17622,10 +17741,18 @@ class WorkitCore {
       requirements
     });
   }
-  compactContext(taskId, freshness) {
+  compactContext(taskId, freshness, origin = null) {
     const root = this.contextRootError();
     if (!root.ok)
       return root;
+    const base = origin && this.store.readStoreTask(origin.taskId);
+    const inherited = base?.ok && base.data ? {
+      origin: origin.origin,
+      taskId: base.data.id,
+      decisions: base.data.decisions.filter((entry) => entry.data.revoked === null)
+    } : null;
+    if (taskId === null)
+      return success(null, null, inherited?.decisions.length ? compactTaskContext(null, inherited) : "");
     const task = this.store.readTask(taskId);
     if (!task.ok)
       return task;
@@ -17635,7 +17762,7 @@ class WorkitCore {
     const view = this.view(task.data, false, freshness ?? signalFreshness(this.store.root));
     if (!view.ok)
       return view;
-    return success(view.revision, view.workspaceRevision, compactTaskContext(view.data));
+    return success(view.revision, view.workspaceRevision, compactTaskContext(view.data, inherited));
   }
   view(task, capture = true, freshness = treeFreshness(this.store.root)) {
     const workspace = this.store.readWorkspace();
@@ -19074,8 +19201,9 @@ var currentTaskEntry = (entries, session, selection) => {
   const active = entries.filter((entry) => entry.status === "active");
   return active.length === 1 ? active[0] : null;
 };
+var otherConversation = (entry, session) => entry.sessions.some((item) => item.host !== "workit_cli" && !(item.host === session.host && item.handle === session.handle));
 var implicitTaskEntry = (store, entries, session) => {
-  const open = entries.filter((entry) => entry.key !== null && entry.status !== "closed" && !entry.sessions.some((item) => item.host !== "workit_cli" && !(item.host === session.host && item.handle === session.handle)));
+  const open = entries.filter((entry) => entry.key !== null && entry.status !== "closed" && !otherConversation(entry, session));
   if (open.length === 0)
     return null;
   const key = store.currentKey();
@@ -19116,18 +19244,23 @@ function sessionCompactContext(store, session, context, selection = "session-bou
   if (!listed.ok)
     return migrationPending(listed) ? MIGRATION_PENDING_NOTE : null;
   const entry = currentTaskEntry(listed.data, session, selection) ?? implicitTaskEntry(store, listed.data, session);
-  return entry ? entryCompactContext(store, entry, session, context) : null;
+  return entryCompactContext(store, entry, session, context);
 }
 function entryCompactContext(store, entry, session, context) {
+  const found = store.originTaskEntry();
+  const origin = found.ok && found.data && found.data.entry.id !== entry?.id && !otherConversation(found.data.entry, session) ? found.data : null;
+  if (!entry && !origin)
+    return null;
   const workspace = store.readWorkspace();
-  if (!workspace.ok || !workspace.data)
+  if (!workspace.ok || entry && !workspace.data)
     return null;
   const slot = `${store.root}\x00${session.host}\x00${session.handle}`;
   const key = canonicalJson({
-    task: entry.id,
-    revision: entry.revision,
-    file: entry.file,
-    workspace: workspace.data.revision,
+    task: entry?.id ?? null,
+    revision: entry?.revision ?? null,
+    file: entry?.file ?? null,
+    origin: origin && origin.entry.file,
+    workspace: workspace.data?.revision ?? null,
     caller: context.caller,
     workerId: context.workerId ?? null,
     capabilities: context.capabilities
@@ -19135,15 +19268,15 @@ function entryCompactContext(store, entry, session, context) {
   const hit = cache.get(slot);
   if (hit && hit.key === key && hit.filesKey !== null && hit.filesKey === filesKey(hit.files) && (hit.signal === null || hit.signal === recentSignal(store.root)))
     return hit.value;
-  const task = store.readTask(entry.id);
-  if (!task.ok)
+  const task = entry ? store.readTask(entry.id) : null;
+  if (task && !task.ok)
     return null;
   const freshness = { mode: "signal", current: () => recentSignal(store.root) };
-  const observed = task.data.evidence.some(isObservedCheck);
-  const files = task.data.decisions.flatMap((decision) => decision.data.binding.contentRefs.flatMap((ref) => ref.kind === "file" ? [path20.resolve(store.root, ref.path)] : []));
+  const observed = task?.data.evidence.some(isObservedCheck) ?? false;
+  const files = (task?.data.decisions ?? []).flatMap((decision) => decision.data.binding.contentRefs.flatMap((ref) => ref.kind === "file" ? [path20.resolve(store.root, ref.path)] : []));
   const observedFiles = filesKey(files);
-  const compact = new WorkitCore(store, context).compactContext(entry.id, freshness);
-  if (!compact.ok)
+  const compact = new WorkitCore(store, context).compactContext(entry?.id ?? null, freshness, origin && { origin: origin.origin, taskId: origin.entry.id });
+  if (!compact.ok || !compact.data)
     return null;
   cache.delete(slot);
   cache.set(slot, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-opencode",
-  "version": "8.9.0",
+  "version": "8.9.1",
   "private": false,
   "description": "Workit OpenCode plugin — native tools, adaptive policy, and sixteen method skills",
   "keywords": [
@@ -39,7 +39,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@brainervirus/workit-core": "^8.9.0"
+    "@brainervirus/workit-core": "^8.9.1"
   },
   "devDependencies": {
     "@opencode/plugin": "2.0.18"