phewsh 0.15.33 → 0.15.35

package/commands/hook.js

@@ -111,6 +111,28 @@ function sessionStart() {
   const cont = continuityBrief(path.basename(process.cwd()));
   if (cont) parts.push(`\n## Continuity (across your tools)\n${cont}`);
 
+  // Drift nudge (read-only): if code moved ahead of .intent/, say so — right
+  // here, where the agent will see it — so the human knows *when* to reconcile.
+  // We never auto-rewrite their source of truth; we just make the gap visible.
+  try {
+    const { statusDrift } = require('../lib/truth');
+    const drift = statusDrift(process.cwd());
+    if (drift && drift.tracked && drift.commitsSince > 0) {
+      parts.push(`\n## ⚠ phewsh drift\n.intent/ is ${drift.commitsSince} commit(s) behind the code (since ${drift.lastCommit}) — its current-state claims may be stale. Good moment to reconcile so every tool inherits today's reality.`);
+    }
+  } catch { /* drift is a nicety; never break the host */ }
+
+  // Ambient operating guidance: make phewsh *felt*, not invoked. The human may
+  // not know a single slash command — translate intent into phewsh actions for
+  // them, nudge gently, and leave a quiet signature so they feel the layer.
+  parts.push(`\n## Working with phewsh installed (ambient guidance)
+phewsh keeps this project's intent, decisions, and outcomes aligned across every AI tool — so nothing is lost when the human switches tools. Help it work *for* them without making them learn it:
+- Do their actual request first, and well.
+- When you make a real decision, ship something, or change direction, offer in plain language to keep the shared record current — e.g. "want me to reconcile this into phewsh so your other tools inherit it?" Never make them memorize slash commands; map their intent to phewsh actions yourself.
+- If the drift note above is present, mention it once, gently.
+- Keep nudges subtle and occasional — never nag, never block the work.
+- When phewsh context shaped your reply, sign off quietly with 😮‍💨🤫 (e.g. "— 😮‍💨🤫") so the human feels the continuity layer working in the background.`);
+
   parts.push(`\n(Brief injected by PHEWSH ambient from .intent/. Honor the constraints above. The human can run \`phewsh\` for mission control — council, outcomes, the decision record.)`);
 
   process.stdout.write(parts.join('\n') + '\n');

package/commands/session.js

@@ -383,6 +383,7 @@ async function main() {
   let route = resolveRoute(config, harnesses);
   let sessionMode = null;          // INTENT_MODES id once picked
   let awaitingOutcome = null;      // decision id eligible for 1-4 labeling
+  let provisionalOutcome = null;   // verdict phewsh inferred from the diff — Enter ↵ confirms it
   let awaitingWhy = null;          // { id, outcome } — next line is the reason
   let awaitingReconcile = null;    // exact proposed append, applied only after y
   let lastTransitionReport = null; // latest native preflight -> postflight comparison
@@ -1154,6 +1155,25 @@ async function main() {
       // anything else: drop the offer and treat it as fresh input
     }
 
+    // Enter ↵ confirms the provisional verdict phewsh inferred from the diff —
+    // ambient capture so you never have to remember to run /outcomes.
+    if (awaitingOutcome && provisionalOutcome && input.trim() === '') {
+      const outcome = provisionalOutcome;
+      try {
+        labelOutcome(awaitingOutcome, outcome);
+        console.log(`  ${teal('●')} ${sage('outcome:')} ${green(outcome)} ${slate('· confirmed')}`);
+      } catch { /* decision vanished */ }
+      awaitingOutcome = null; provisionalOutcome = null;
+      console.log('');
+      rl.prompt();
+      return;
+    }
+    // Typed something other than a verdict? They've moved on — drop the
+    // provisional so a later stray Enter can't auto-confirm it.
+    if (awaitingOutcome && provisionalOutcome && input.trim() !== '' && !/^[1-4]$/.test(input.trim())) {
+      provisionalOutcome = null;
+    }
+
     // A bare 1-4 right after a routed action labels its outcome
     if (awaitingOutcome && /^[1-4]$/.test(input)) {
       const outcome = OUTCOMES[parseInt(input, 10) - 1];
@@ -1165,6 +1185,7 @@ async function main() {
       } catch { /* decision vanished — nothing to do */ }
       const id = awaitingOutcome;
       awaitingOutcome = null;
+      provisionalOutcome = null;
       // For a regret, the reason is the gold — capture one line so /recall can
       // tell you *why* next time. Kept/superseded stay frictionless.
       if (labeled && (outcome === 'reverted' || outcome === 'failed')) {
@@ -2401,7 +2422,7 @@ async function main() {
         const preflightTruth = await auditTruth();
         const before = captureSnapshot(preflightTruth);
         const generatedBrief = await generateBrief({ report: preflightTruth });
-        const launchBrief = `${generatedBrief.content}\n\nYou are receiving a PHEWSH handoff brief — acknowledge in one short line that you've loaded it, then proceed. Use it as project context, preserve native tool behavior, and verify claims against the repository before acting. When you finish, exit this tool — PHEWSH resumes, runs an automatic postflight comparing what changed against this brief, and offers reconciliation.`;
+        const launchBrief = `${generatedBrief.content}\n\nYou are receiving a PHEWSH handoff brief — acknowledge in one short line that you've loaded it, then proceed. Use it as project context, preserve native tool behavior, and verify claims against the repository before acting. When you finish, exit this tool — PHEWSH resumes, runs an automatic postflight comparing what changed against this brief, and offers reconciliation.\n\nAmbient guidance: the human may not know any phewsh commands — make the layer felt, not invoked. Do their request first; when you make a real decision, ship something, or change direction, offer in plain language to keep the shared record current ("want me to reconcile this into phewsh so your other tools inherit it?"). Keep it subtle, never nag. When phewsh context shaped your reply, sign off quietly with 😮‍💨🤫 so they feel the continuity layer working.`;
         const savedBrief = persistBrief(generatedBrief.content, { project: projectName, route: target });
         const launch = interactiveLaunchArgs(target, launchBrief, { model: harnessModel });
         // Foolproof fallback: the brief on the clipboard survives the native
@@ -2460,10 +2481,21 @@ async function main() {
           briefingHash: savedBrief.hash,
         });
         awaitingOutcome = decisionId;
+        // Ambient outcome capture: infer a provisional verdict from what the
+        // session actually did, so the human confirms with one keystroke
+        // instead of recalling. Honest — it's a confirmed default, not a
+        // silent label; the human can always correct it with 1-4.
+        provisionalOutcome = (postflight.headChanged || postflight.files.length > 0) ? 'kept' : null;
         console.log('');
         console.log(formatObservedReport(postflight, { title: `${h.label} session ended — postflight` }));
         console.log('');
-        console.log(`  ${teal('●')} ${sage('Back in phewsh.')} ${slate("1 kept · 2 undid · 3 redid · 4 flopped · /reconcile · /switch <tool>")}`);
+        if (provisionalOutcome) {
+          const why = postflight.headChanged ? 'committed work is in your repo' : 'changes are in your working tree';
+          console.log(`  ${teal('●')} ${sage('Back in phewsh.')} ${sage('Looks ')}${green('kept')} ${slate('(' + why + ') — enter ↵ to confirm')}`);
+          console.log(`  ${slate('or correct it: 1 kept · 2 undid · 3 redid · 4 flopped · /reconcile · /switch <tool>')}`);
+        } else {
+          console.log(`  ${teal('●')} ${sage('Back in phewsh.')} ${slate('No changes detected. 1 kept · 2 undid · 3 redid · 4 flopped · /reconcile · /switch <tool>')}`);
+        }
         console.log('');
         rl.prompt();
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phewsh",
-  "version": "0.15.33",
+  "version": "0.15.35",
   "description": "Turn intent into action. Structure your thinking, execute your next step.",
   "bin": {
     "phewsh": "bin/phewsh.js"