hanoman 0.1.36 → 0.1.38

package/dist/build-info.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.36",
-  "sha": "367eb05",
-  "builtAt": "2026-08-14T16:01:32.161Z"
+  "version": "0.1.38",
+  "sha": "31209e5",
+  "builtAt": "2026-08-14T17:51:33.674Z"
 }

package/dist/server.js

@@ -12177,13 +12177,14 @@ async function recordConflict(entity, recordId, local, server) {
     localUpdatedAt: stamp(local.data),
     serverData: server.data,
     serverVersion: server.version,
-    serverUpdatedAt: stamp(server.data),
-    resolvedAt: null
+    serverUpdatedAt: stamp(server.data)
   };
+  const prev = await prisma.syncConflict.findUnique({ where: { entity_recordId: { entity, recordId } } });
+  if (prev?.resolvedAt && prev.localVersion === local.version && prev.serverVersion === server.version) return;
   await prisma.syncConflict.upsert({
     where: { entity_recordId: { entity, recordId } },
-    create: row,
-    update: { ...row, detectedAt: /* @__PURE__ */ new Date() }
+    create: { ...row, resolvedAt: null },
+    update: { ...row, resolvedAt: null, detectedAt: /* @__PURE__ */ new Date() }
   });
 }
 async function listConflicts() {
@@ -12207,8 +12208,10 @@ async function resolveConflict(entity, recordId, choice, push) {
   if (choice === "server") {
     await upsertLocal(entity, recordId, c.serverVersion, c.serverData);
   } else {
-    const res = await push([{ entity, id: recordId, baseVersion: c.serverVersion, data: c.localData }]);
-    const r = res.results?.[0];
+    let r = (await push([{ entity, id: recordId, baseVersion: c.serverVersion, data: c.localData }])).results?.[0];
+    if (!r?.ok && r?.conflict && typeof r.server?.version === "number" && r.server.version !== c.serverVersion) {
+      r = (await push([{ entity, id: recordId, baseVersion: r.server.version, data: c.localData }])).results?.[0];
+    }
     if (!r?.ok) {
       if (r?.conflict) return { ok: false, reason: "still-conflict" };
       return { ok: false, reason: "not-found" };
@@ -30234,6 +30237,7 @@ async function recordSessionResult(input) {
 // src/routes/terminal.ts
 init_stage_machine();
 init_pty();
+var TERMINAL_WS_MESSAGES_PER_MINUTE = 6e3;
 async function advanceStage(specId, repoDir, sessionId2, flow, worktree) {
   const next = stageForRun(readPhases(phaseFilePath(repoDir, sessionId2), flow), worktree, specId);
   if (!next) return;
@@ -30577,7 +30581,7 @@ async function terminal_default(app2, opts) {
       socket2.close(1008, "connection limit");
       return;
     }
-    const guard = new WsMessageGuard();
+    const guard = new WsMessageGuard({ perWindow: TERMINAL_WS_MESSAGES_PER_MINUTE });
     const client = { send: (m) => socket2.send(m), close: () => socket2.close() };
     attach(id, client);
     socket2.on("message", async (raw2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hanoman",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Orchestrator + dashboard workflow docs-driven untuk sesi Claude Code / Codex",
   "type": "module",
   "repository": {