theslopmachine 1.0.24 → 1.0.25

package/assets/slopmachine/utils/claude_live_common.mjs

@@ -546,13 +546,13 @@ export async function waitForHookEvent(paths, startIndex, labels, timeoutMs, mat
   return waitFor(async () => {
     const events = await readJsonl(paths.hookEventsFile)
     const pending = events.slice(startIndex)
-    const match = pending.find((event) => labels.has(event.label) && (!matcher || matcher(event)))
-    if (!match) {
+    const matchIndex = pending.findIndex((event) => labels.has(event.label) && (!matcher || matcher(event)))
+    if (matchIndex === -1) {
       return null
     }
     return {
-      event: match,
-      eventsLength: events.length,
+      event: pending[matchIndex],
+      eventsLength: startIndex + matchIndex + 1,
     }
   }, {
     timeoutMs,

package/assets/slopmachine/utils/claude_live_turn.mjs

@@ -23,6 +23,7 @@ import {
   readState,
   tmuxHasSession,
   tmuxPasteFileAndEnter,
+  tmuxSendEnter,
   waitForRateLimitReset,
   waitForHookEvent,
   writeState,
@@ -50,6 +51,8 @@ const runtimeDir = argv['runtime-dir']
 const promptFile = typeof argv['prompt-file'] === 'string' ? argv['prompt-file'].trim() : ''
 const turnTimeoutMs = Number.parseInt(argv['timeout-ms'] || String(DEFAULT_TURN_TIMEOUT_MS), 10)
 const retryOnLimit = argv['retry-on-limit'] !== '0'
+const SUBMIT_CONFIRM_TIMEOUT_MS = 5000
+const SUBMIT_ENTER_RETRIES = 3
 
 if (!runtimeDir || !promptFile) {
   emitFailure('claude_live_turn_invalid_args', 'Missing required turn arguments', {
@@ -70,6 +73,38 @@ function emitTurnFailure(resultPayload) {
   })
 }
 
+async function confirmPromptSubmitted({ paths, hookStartIndex, turnId, tmuxSession, runtimeDir, turnDir }) {
+  let currentHookStartIndex = hookStartIndex
+  for (let attempt = 0; attempt <= SUBMIT_ENTER_RETRIES; attempt += 1) {
+    try {
+      const { eventsLength } = await waitForHookEvent(
+        paths,
+        currentHookStartIndex,
+        new Set(['UserPromptSubmit']),
+        SUBMIT_CONFIRM_TIMEOUT_MS,
+        (hookEvent) => hookEvent?.turn_id === turnId,
+      )
+      await writeState(runtimeDir, {
+        current_turn_prompt_submitted_at: new Date().toISOString(),
+        current_turn_submit_enter_retries: attempt,
+      })
+      return { ok: true, eventsLength }
+    } catch {
+      if (attempt === SUBMIT_ENTER_RETRIES) {
+        break
+      }
+      await tmuxSendEnter(tmuxSession)
+      await writeState(runtimeDir, {
+        current_turn_submit_enter_retries: attempt + 1,
+      })
+    }
+  }
+
+  const blockerFile = path.join(turnDir, `prompt-submit-unconfirmed-pane-${Date.now()}.txt`)
+  await captureTmuxPaneArtifact(tmuxSession, blockerFile)
+  return { ok: false, blockerFile }
+}
+
 try {
   const promptSource = path.resolve(promptFile)
 
@@ -237,6 +272,34 @@ try {
       current_turn_prompt_injected_at: new Date().toISOString(),
     })
 
+    const submitConfirmation = await confirmPromptSubmitted({
+      paths,
+      hookStartIndex,
+      turnId,
+      tmuxSession: liveState.tmux_session || state.tmux_session,
+      runtimeDir,
+      turnDir,
+    })
+    if (!submitConfirmation.ok) {
+      const resultPayload = buildFailureResult('claude_prompt_submit_unconfirmed', 'Claude prompt was pasted, but UserPromptSubmit did not fire after repeated Enter sends', liveState.sid || state.sid)
+      await writeTurnArtifacts(paths, turnId, prompt, resultPayload, argv['result-file'] || null)
+      await writeState(runtimeDir, {
+        status: 'failed',
+        current_turn_id: null,
+        current_turn_prompt_file: null,
+        current_turn_prompt_source: null,
+        current_turn_started_at: null,
+        current_turn_transport: 'tmux-paste-buffer',
+        last_completed_turn_id: turnId,
+        last_turn_number: turnNumber + 1,
+        last_error: resultPayload.msg,
+        prompt_submit_unconfirmed_pane_file: submitConfirmation.blockerFile,
+      })
+      emitTurnFailure(resultPayload)
+      process.exit(1)
+    }
+    hookStartIndex = submitConfirmation.eventsLength
+
     const { event, eventsLength } = await waitForHookEvent(
       paths,
       hookStartIndex,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theslopmachine",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "SlopMachine installer and project bootstrap CLI",
   "license": "MIT",
   "type": "module",