agendex-cli 1.0.0 → 1.1.0

package/dist/cli.js

@@ -1924,6 +1924,19 @@ function parseDate2(value) {
     return;
   return date;
 }
+function liveSessionIdentity(input) {
+  if (input.sourcePlanPath) {
+    return hashPath(`plannotator-live:${resolve2(input.sourcePlanPath)}`);
+  }
+  if (input.session.reviewId) {
+    return hashPath(`plannotator-live-review:${input.session.reviewId}`);
+  }
+  const project = input.session.project ?? input.planResponse.versionInfo?.project ?? input.planResponse.projectRoot;
+  if (project && input.session.label) {
+    return hashPath(`plannotator-live:${project}:${input.session.label}:${input.mode}`);
+  }
+  return hashPath(input.sessionPath);
+}
 function metadataRecord(metadata) {
   return {
     source: "plannotator",
@@ -2090,7 +2103,13 @@ async function parseLiveSession(filePath) {
     };
     return [
       {
-        id: hashPath(filePath),
+        id: liveSessionIdentity({
+          sessionPath: filePath,
+          session,
+          planResponse,
+          mode: responseMode,
+          sourcePlanPath
+        }),
         agent: origin ?? "plannotator",
         title: extractTitle5(planResponse.plan, session.label ?? filePath),
         content: planResponse.plan,
@@ -2182,6 +2201,12 @@ var plannotatorAdapter = {
       return false;
     if (!isSafePlannotatorUrl(metadata.url))
       return false;
+    if (payload.action === "approve") {
+      return await postJson(apiUrl(metadata.url, "/api/approve"), {
+        ...payload.feedback.trim() && { feedback: payload.feedback.trim() },
+        planSave: { enabled: true }
+      });
+    }
     const feedback = formatWritebackFeedback(plan, payload);
     if (metadata.mode === "review" || metadata.mode === "annotate") {
       return await postJson(apiUrl(metadata.url, "/api/feedback"), {
@@ -3581,7 +3606,13 @@ async function requestChanges(id, payload) {
     return false;
   const ok = await adapter.requestChanges(plan, payload);
   if (ok) {
-    const plannotator = typeof plan.metadata.plannotator === "object" && plan.metadata.plannotator !== null ? { ...plan.metadata.plannotator, lastWritebackStatus: "sent", lastWritebackAt: Date.now() } : undefined;
+    const writebackAt = Date.now();
+    const plannotator = typeof plan.metadata.plannotator === "object" && plan.metadata.plannotator !== null ? {
+      ...plan.metadata.plannotator,
+      ...payload.action === "approve" ? { status: "approved" } : {},
+      lastWritebackStatus: "sent",
+      lastWritebackAt: writebackAt
+    } : undefined;
     if (plannotator)
       plan.metadata = { ...plan.metadata, plannotator };
     plan.updatedAt = new Date;
@@ -4635,7 +4666,7 @@ var RESTART_WINDOW_MS = 60000;
 var RESTART_DELAY_MS = 5000;
 var PLANNOTATOR_WRITEBACK_POLL_INTERVAL_MS = 15000;
 var PLANNOTATOR_WRITEBACK_EXPIRED_ERROR = "Write-back expired before delivery.";
-var PLANNOTATOR_WRITEBACK_FAILED_ERROR = "No live Plannotator session accepted the request-changes payload.";
+var PLANNOTATOR_WRITEBACK_FAILED_ERROR = "No live Plannotator session accepted the write-back payload.";
 var PLANNOTATOR_LIVENESS_SWEEP_INTERVAL_MS = 20000;
 function isRecord5(value) {
   return typeof value === "object" && value !== null;
@@ -4814,6 +4845,7 @@ async function runWorker() {
       return;
     }
     const ok = await requestChanges(job.localPlanId, {
+      action: job.action,
       feedback: job.feedback,
       revisedContent: job.revisedContent,
       annotations: job.annotations,
@@ -4824,7 +4856,11 @@ async function runWorker() {
     if (ok) {
       const updatedPlan = getById(job.localPlanId);
       if (updatedPlan) {
-        syncQueue.push(planToSyncPayload(updatedPlan, config.deviceId, hostname2, await getSyncIpAddress()));
+        const updatedPayload = planToSyncPayload(updatedPlan, config.deviceId, hostname2, await getSyncIpAddress());
+        syncQueue.push(updatedPayload);
+        if (isLivePlannotatorPayload(updatedPayload)) {
+          liveSessions.set(updatedPayload.localPlanId, updatedPayload);
+        }
       }
       pendingWritebackReports.set(job._id, "sent");
       persistPendingWritebackReports();
@@ -4948,8 +4984,12 @@ async function startSupervisor() {
   const scriptPath = resolve6(process.argv[1] ?? fileURLToPath(new URL("./cli.ts", import.meta.url)));
   const restartTimes = [];
   while (!stopping) {
-    workerProc = spawn2(process.execPath, [scriptPath, "start", "--worker"], {
-      stdio: ["ignore", "inherit", "inherit"]
+    const workerArgs = [scriptPath, "start", "--worker"];
+    if (isDevMode())
+      workerArgs.push("--dev");
+    workerProc = spawn2(process.execPath, workerArgs, {
+      stdio: ["ignore", "inherit", "inherit"],
+      env: { ...process.env, ...isDevMode() ? { AGENDEX_DEV: "1" } : {} }
     });
     const exitCode = await new Promise((resolve7) => {
       workerProc?.once("exit", (code) => resolve7(code));
@@ -5418,7 +5458,7 @@ import { join as join15 } from "node:path";
 // package.json
 var package_default = {
   name: "agendex-cli",
-  version: "1.0.0",
+  version: "1.1.0",
   description: "Agendex CLI for login, sync, and daemon workflows",
   homepage: "https://github.com/Tyru5/Agendex#readme",
   bugs: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agendex-cli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Agendex CLI for login, sync, and daemon workflows",
   "homepage": "https://github.com/Tyru5/Agendex#readme",
   "repository": {