@raidiant/notifai 11.3.2 → 11.4.0

package/dist/commands-update.js

@@ -5,10 +5,11 @@ import { inspectCliInstallations, withoutNpxLauncherPath, } from './cli-bin.js';
 import { EXIT } from './commands-core.js';
 import { hookAdapterPath, installHookAdapter, inspectHookAdapter, isNpxAdapterTarget, } from './hook-adapter.js';
 import { packageVersion } from './release.js';
-import { CLI_PACKAGE_NAME, cliUpdateRecoveryCommand } from './cli-contract.js';
+import { CLI_PACKAGE_NAME, cliPackageSpec, cliUpdateChannel, cliUpdateRecoveryCommand, } from './cli-contract.js';
+import { cliReleaseTarget, parseCliDistTags } from './cli-release.js';
 import { pathContainsDirectory } from './local-path.js';
 import { npmInvocation } from './npm-invocation.js';
-import { compareVersions } from './version.js';
+import { compareReleasePrecedence } from './version.js';
 function runningArtifact(deps) {
     const target = deps.hookInstallTarget;
     if (target !== undefined && !isNpxAdapterTarget(target))
@@ -35,7 +36,7 @@ function inspection(deps) {
     const artifact = runningArtifact(deps);
     return inspectCliInstallations(deps.env, deps.hookPlatform ?? process.platform, {
         ...(artifact === undefined ? {} : { runningArtifactPath: artifact }),
-        currentVersion: packageVersion(),
+        currentVersion: deps.runningVersion === undefined ? packageVersion() : deps.runningVersion,
     });
 }
 function prefixIsAddressable(deps, prefix) {
@@ -43,19 +44,38 @@ function prefixIsAddressable(deps, prefix) {
     const commandDirectory = platform === 'win32' ? prefix : path.join(prefix, 'bin');
     return pathContainsDirectory(deps.env, commandDirectory, platform);
 }
-function failed(deps, flags, code, before, packageManagerPrefix) {
-    const recoveryMessage = code === 'update_destination_unknown'
+/**
+ * Read the dist-tags from the registry npm itself installs from, so a custom
+ * registry configuration answers for both the read and the install.
+ */
+function publishedDistTags(deps) {
+    const view = npmRun(deps, ['view', CLI_PACKAGE_NAME, 'dist-tags', '--json']);
+    if (view.status !== 0 || typeof view.stdout !== 'string')
+        return null;
+    try {
+        return parseCliDistTags(JSON.parse(view.stdout));
+    }
+    catch {
+        return null;
+    }
+}
+function failed(deps, flags, failure, before, packageManagerPrefix) {
+    const { code, message, recoveryCommand: explicitRecovery, target } = typeof failure === 'string' ? { code: failure } : failure;
+    const recoveryMessage = message ?? (code === 'update_destination_unknown'
         ? 'Notifai could not identify an npm-global installation to update. Use the package manager that installed the resolved command to update it; the diagnostic below can inspect the installation.'
         : code === 'package_manager_prefix_not_on_path'
             ? 'The npm global command directory is not on PATH. Add the bin directory for the reported package-manager prefix to PATH (the prefix itself on Windows), then inspect the installation with the diagnostic below before retrying the update.'
-            : null;
-    const recoveryCommand = recoveryMessage === null ? cliUpdateRecoveryCommand() : `npx --yes ${CLI_PACKAGE_NAME}@latest doctor --json`;
+            : null);
+    const recoveryCommand = explicitRecovery ?? (recoveryMessage === null
+        ? cliUpdateRecoveryCommand(flags.channel)
+        : `npx --yes ${cliPackageSpec(flags.channel === 'beta' ? 'beta' : 'latest')} doctor --json`);
     if (flags.json === true) {
         deps.io.out(JSON.stringify({
             ok: false,
             code,
             recovery_command: recoveryCommand,
             ...(recoveryMessage === null ? {} : { message: recoveryMessage }),
+            ...(target === undefined ? {} : { target }),
             package_manager_prefix: packageManagerPrefix,
             before,
             after: inspection(deps),
@@ -72,12 +92,51 @@ function failed(deps, flags, code, before, packageManagerPrefix) {
  * the stable hook adapter at that same artifact. The npm executable may own a
  * different global prefix; --prefix makes that ambient choice irrelevant.
  */
-export function cliUpdateCommand(deps, flags) {
+export function cliUpdateCommand(deps, requested) {
+    const requestedChannel = requested.channel ?? 'stable';
+    if (requestedChannel !== 'stable' && requestedChannel !== 'beta') {
+        deps.io.err('--channel must be stable or beta');
+        return EXIT.failed;
+    }
+    const channel = requestedChannel;
     // Carry the caller's effective PATH into npm and the new artifact's handoff,
     // otherwise each child would diagnose the temporary npx runner as installed.
     deps = { ...deps, env: withoutNpxLauncherPath(deps.env, deps.hookPlatform ?? process.platform, runningArtifact(deps) ?? 'notifai') };
-    flags = { ...flags, json: flags.json === true || deps.io.interactive !== true };
+    const flags = { ...requested, channel, json: requested.json === true || deps.io.interactive !== true };
     const before = inspection(deps);
+    // A beta channel, or a beta installation, installs one exact resolved
+    // release, and never one that would move the installation backwards. A
+    // stable installation updating on the stable channel keeps plain `latest`.
+    const installed = before.effective?.version ?? before.current.version;
+    let target = null;
+    if (channel === 'beta' || cliUpdateChannel(installed) === 'beta') {
+        const tags = publishedDistTags(deps);
+        if (tags === null) {
+            return failed(deps, flags, {
+                code: 'release_versions_unavailable',
+                message: 'Notifai could not read the published release versions, so nothing was installed. Check the connection to the npm registry, then retry with:',
+                recoveryCommand: cliUpdateRecoveryCommand(channel),
+            }, before, null);
+        }
+        target = cliReleaseTarget(tags, channel);
+        if (installed !== null && compareReleasePrecedence(target.version, installed) === 'before') {
+            const betaTarget = cliReleaseTarget(tags, 'beta');
+            const betaMovesForward = channel === 'stable' &&
+                compareReleasePrecedence(betaTarget.version, installed) !== 'before';
+            return failed(deps, flags, betaMovesForward
+                ? {
+                    code: 'update_would_downgrade',
+                    message: `The installed Notifai ${installed} is newer than the stable release ${target.version}, so nothing was installed. Keep it current on the beta channel with:`,
+                    recoveryCommand: cliUpdateRecoveryCommand('beta'),
+                    target,
+                }
+                : {
+                    code: 'update_would_downgrade',
+                    message: `The installed Notifai ${installed} is newer than every published release, so nothing was installed. Inspect the installation with:`,
+                    target,
+                }, before, null);
+        }
+    }
     const prefixResult = npmRun(deps, ['prefix', '--global']);
     const packageManagerPrefix = prefixResult.status === 0 && typeof prefixResult.stdout === 'string' && prefixResult.stdout.trim() !== ''
         ? prefixResult.stdout.trim()
@@ -97,7 +156,7 @@ export function cliUpdateCommand(deps, flags) {
         '--global',
         '--prefix',
         targetPrefix,
-        CLI_PACKAGE_NAME,
+        cliPackageSpec(target?.version ?? 'latest'),
     ]);
     if (install.status !== 0) {
         return failed(deps, flags, 'package_install_failed', before, packageManagerPrefix);
@@ -110,10 +169,13 @@ export function cliUpdateCommand(deps, flags) {
         (before.effective !== null && effective.command_path !== before.effective.command_path)) {
         return failed(deps, flags, 'effective_command_not_repaired', before, packageManagerPrefix);
     }
+    if (target !== null && effective.version !== target.version) {
+        return failed(deps, flags, { code: 'effective_command_not_target', target }, before, packageManagerPrefix);
+    }
     const minimumCurrent = before.current.version;
     const currentComparison = minimumCurrent === null
         ? 'unparseable'
-        : compareVersions(effective.version, minimumCurrent);
+        : compareReleasePrecedence(effective.version, minimumCurrent);
     if (currentComparison === 'unparseable') {
         return failed(deps, flags, 'effective_command_version_unknown', before, packageManagerPrefix);
     }
@@ -175,6 +237,7 @@ export function cliUpdateCommand(deps, flags) {
             ok: true,
             package_manager_prefix: packageManagerPrefix,
             update_prefix: targetPrefix,
+            target: target ?? { version: null, dist_tag: 'latest' },
             handoff,
             follow_up_required: true,
             handoff_error: handoff === null ? 'Run notifai update --check --json with the updated CLI before claiming guidance or session readiness.' : null,

package/dist/commands-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"commands-update.js","sourceRoot":"","sources":["../src/commands-update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commands-update.js","sourceRoot":"","sources":["../src/commands-update.ts"],"names":[],"mappings":"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"}

package/dist/guidance-content.js

@@ -70,20 +70,14 @@ Good:
 
 - \`Users can now create accounts\` — the capability, not the process behind it
 - \`Password reset emails aren't sending\` — the failure as the user experiences it
-- \`Refund rollout awaits provider recovery\` — what is stuck, not machinery
-- \`Found why checkout was flaky\` — the finding they were waiting on
 - \`3 orders didn't import and need review\` — a count that earns its place
   because acting on it is theirs to do
 
 Bad:
 
 - \`All 42 tests passed\` — machinery; say what work is done
-- \`Adversarial review found 3 issues\` — process report; say what it means for
-  what ships
-- \`Migration 0007 failed\` — internal identifier; say what the user lost
 - \`Task complete\` / \`Build failed\` / \`Need input\` — no substance, and the
   kind restated
-- \`Exit code 1\` — mechanics, not meaning
 `;
 const CONTENT = `# Content
 
@@ -102,41 +96,19 @@ The focused view shows the Body when one exists, otherwise the Summary. It never
 shows both together, so do not write a Body that depends on the Summary sitting
 above it. Never put partial Markdown in Summary.
 
-Use Markdown proportionately to make a Body easy to scan: paragraphs for simple
-prose; headings, lists, links, tables, code, and media references when those
-structures genuinely clarify the content. All attached media may be referenced
-from the Body. Summary contains no media markup.
+Use Markdown structure (headings, lists, tables, code) only where it helps a
+Body scan. All attached media may be referenced from the Body. Summary contains no media markup.
 
 Keep both fields about what changes for the User and what is needed from them,
 never how many tests ran, how long a step took, or which internal stage produced
 it. Keep wording channel-neutral: no device names, no gestures.
 
-Work finished:
+Good content leads with the outcome and what, if anything, is needed next;
+worked examples for finished, failed, and blocked work are in the Notifai
+skill's \`references/writing-examples.md\`.
 
-> Account creation works end to end now: sign-up, email verification, and
-> login are live on staging.
->
-> Next I'll start on password reset unless you want something else first.
-
-Work failed:
-
-> The new pricing page isn't live. The deploy failed and I rolled it back, so
-> the site still shows the old page — nothing is broken for users.
->
-> The blocker is on my side and I'm fixing it; I'll retry and confirm when the
-> page is up. Nothing needed from you.
-
-Blocked:
-
-> The refund flow is built, but the production rollout is waiting for the
-> payment provider to recover. I am monitoring it and will resume automatically.
->
-> There is nothing for you to answer; I will confirm when it is live.
-
-Bad content: a build report (\`42/42 green, coverage 87%, rebased onto main\`)
-where the news is "users can now create accounts"; the journey ("first I
-tried…") instead of the result; a log with the conclusion at the bottom; "see
-terminal for details".
+Bad content: build metrics instead of the user outcome, a work log instead
+of the result, or "see terminal for details".
 `;
 const QUESTIONS = `# Questions
 
@@ -144,6 +116,8 @@ When work you own or coordinate needs a User response, the answerable question
 itself is a Notification Request. Register it with \`notifai ask\` in the same
 turn you ask in the conversation, even while other work continues or the User
 was recently active. Conversation alone does not reach an away User.
+Ask in plain text and explain each choice; a harness form may stay pending
+after a Notifai reply, so never promise linked closure.
 
 Decisions, approvals, sign-in, credential setup and physical actions count.
 Ask for safe setup or readiness, never for credentials or other private
@@ -168,7 +142,8 @@ Bad:
 const ACKNOWLEDGEMENTS = `# Acknowledgements
 
 An acknowledgement names the concrete work the reply sets in motion — only
-work you will actually do, and nothing generic.
+work you will actually do, and nothing generic. Notes and edits too; after
+irreversible work, say so rather than imply it was undone.
 
 It confirms receipt, not fulfillment. Return the requested result through
 Notifai when ready; acknowledgement text may be disabled.
@@ -177,7 +152,6 @@ Good:
 
 - \`Rolling out to staging now; I'll report the health checks.\`
 - \`Holding the deploy. I'll re-raise it once staging is green.\`
-- \`Shipping the fix; I'll confirm when password reset works again.\`
 
 Bad:
 

package/dist/guidance-content.js.map

@@ -1 +1 @@
-{"version":3,"file":"guidance-content.js","sourceRoot":"","sources":["../src/guidance-content.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAWH,8EAA8E;AAC9E,MAAM,CAAC,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;4DAawB,CAAA;AAE5D,MAAM,CAAC,MAAM,oBAAoB,GAAG;;;;gEAI4B,CAAA;AAEhE,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;CAwBtB,CAAA;AAED,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;CAyBd,CAAA;AAED,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoDf,CAAA;AAED,MAAM,SAAS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BjB,CAAA;AAED,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;CAoBxB,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAA6B;IACxD;QACE,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,qCAAqC;QAC9C,OAAO,EAAE,cAAc;KACxB;IACD;QACE,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,qCAAqC;QAC9C,OAAO,EAAE,MAAM;KAChB;IACD;QACE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,4DAA4D;QACrE,OAAO,EAAE,OAAO;KACjB;IACD;QACE,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,2CAA2C;QACpD,OAAO,EAAE,SAAS;KACnB;IACD;QACE,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,kCAAkC;QAC3C,OAAO,EAAE,gBAAgB;KAC1B;CACF,CAAA;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;AAC9D,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA+BJ,CAAA"}
+{"version":3,"file":"guidance-content.js","sourceRoot":"","sources":["../src/guidance-content.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAWH,8EAA8E;AAC9E,MAAM,CAAC,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;4DAawB,CAAA;AAE5D,MAAM,CAAC,MAAM,oBAAoB,GAAG;;;;gEAI4B,CAAA;AAEhE,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;CAwBtB,CAAA;AAED,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;;;;;CAmBd,CAAA;AAED,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8Bf,CAAA;AAED,MAAM,SAAS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BjB,CAAA;AAED,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;CAoBxB,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAA6B;IACxD;QACE,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,qCAAqC;QAC9C,OAAO,EAAE,cAAc;KACxB;IACD;QACE,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,qCAAqC;QAC9C,OAAO,EAAE,MAAM;KAChB;IACD;QACE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,4DAA4D;QACrE,OAAO,EAAE,OAAO;KACjB;IACD;QACE,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,2CAA2C;QACpD,OAAO,EAAE,SAAS;KACnB;IACD;QACE,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,kCAAkC;QAC3C,OAAO,EAAE,gBAAgB;KAC1B;CACF,CAAA;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;AAC9D,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA+BJ,CAAA"}

package/dist/hook-acknowledgements.d.ts

@@ -1,4 +1,19 @@
-import type { AcceptedAnswerDelivery, AcknowledgementDue, AnsweredPending, HookContext, HookOutcome } from './hook-types.js';
+import type { AcceptedAnswerDelivery, AnsweredPending, HookContext, HookOutcome, MessageAcknowledgementDue, OwedAcknowledgement, SessionState } from './hook-types.js';
+export declare function owedAcknowledgementId(owed: OwedAcknowledgement): string;
+/** Every acknowledgement this session still owes, request debt first. */
+export declare function owedAcknowledgements(state: SessionState): OwedAcknowledgement[];
+/**
+ * Record the acknowledgement a Session Message is owed, before it is written:
+ * an agent that acknowledges the moment it reads the message must find the
+ * debt already there to clear.
+ */
+export declare function recordMessageAcknowledgementDue(sessionId: string, env: NodeJS.ProcessEnv, due: MessageAcknowledgementDue): void;
+/**
+ * Every answer that has arrived, as one message. Several registered questions
+ * may resolve in one hook pass; the agent reads them together, each answer
+ * tied to the question that asked it, with a truthful note about anything
+ * still waiting.
+ */
 export declare function answersContext(answered: AnsweredPending[], remaining: number): string;
 export declare function stopAnswerOutput(context: string): string;
 /**
@@ -22,18 +37,23 @@ export declare function finishCommittedDelivery(ctx: HookContext, sessionId: str
 export declare function classifyJournaledAcknowledgements(sessionId: string, env: NodeJS.ProcessEnv): AcceptedAnswerDelivery | undefined;
 /** Resume a queue write recorded by an earlier process without replaying it. */
 export declare function recoverQueuedAnswers(sessionId: string, env: NodeJS.ProcessEnv): void;
-export declare function clearAcknowledgementObligation(sessionId: string, env: NodeJS.ProcessEnv, requestId: string): boolean;
-export declare function acknowledgementBlockContext(due: readonly AcknowledgementDue[]): string;
+/** Forget one owed acknowledgement, dispatched by identifier: `sm_…` or a request id. */
+export declare function clearAcknowledgementObligation(sessionId: string, env: NodeJS.ProcessEnv, id: string): boolean;
+export declare function acknowledgementBlockContext(due: readonly OwedAcknowledgement[]): string;
 /**
  * Hold the turn for an outstanding acknowledgement, or give up and let it
  * through once holding has stopped being worth its cost.
  *
  * Returns the outcome that blocks the turn, or `null` to carry on.
  */
-export declare function holdForAcknowledgement(ctx: HookContext, sessionId: string, due: readonly AcknowledgementDue[], notes: string[]): HookOutcome | null;
+export declare function holdForAcknowledgement(ctx: HookContext, sessionId: string, due: readonly OwedAcknowledgement[], notes: string[]): HookOutcome | null;
 /** A turn that was not held resets the streak; only consecutive holds count. */
 export declare function resetAcknowledgementBlocks(sessionId: string, env: NodeJS.ProcessEnv): void;
-export declare function reconcileAcknowledgementObligations(ctx: HookContext, sessionId: string, due: readonly AcknowledgementDue[]): Promise<AcknowledgementDue[]>;
+/**
+ * Ask the service which owed acknowledgements now exist and forget those.
+ * Returns what is still owed; a failed check counts as still owed.
+ */
+export declare function reconcileAcknowledgementObligations<T extends OwedAcknowledgement>(ctx: HookContext, sessionId: string, due: readonly T[]): Promise<T[]>;
 /**
  * Retire the answered questions and close the journal.
  *

package/dist/hook-acknowledgements.js

@@ -1,9 +1,31 @@
 /** Accepted-answer delivery and required Agent Acknowledgement obligations. */
 import { withFileLock } from './file-lock.js';
 import { gate } from './hook-gates.js';
+import { ACKNOWLEDGEMENT_SCOPE, TRANSPORT_LIMIT, acknowledgementCommand, acknowledgementDemand, quoted, } from './injection-render.js';
 import { retiringQuestion } from './hook-question-retirement.js';
 import { isSamePending, pendingHasChoices, rememberQuestionState } from './hook-question-state.js';
 import { pendingList, readSessionState, sessionStatePath, updateSessionState, writeSessionStateUnlocked, } from './hook-session-state.js';
+import { SESSION_MESSAGE_ID_PREFIX } from '@raidiant/notifai-protocol';
+export function owedAcknowledgementId(owed) {
+    return 'message_id' in owed ? owed.message_id : owed.request_id;
+}
+/** Every acknowledgement this session still owes, request debt first. */
+export function owedAcknowledgements(state) {
+    return [...(state.acknowledgement_due ?? []), ...(state.message_acknowledgement_due ?? [])];
+}
+/**
+ * Record the acknowledgement a Session Message is owed, before it is written:
+ * an agent that acknowledges the moment it reads the message must find the
+ * debt already there to clear.
+ */
+export function recordMessageAcknowledgementDue(sessionId, env, due) {
+    updateSessionState(sessionId, env, (current) => {
+        const owed = current.message_acknowledgement_due ?? [];
+        if (owed.some((entry) => entry.message_id === due.message_id))
+            return current;
+        return { ...current, message_acknowledgement_due: [...owed, due] };
+    });
+}
 /**
  * The answer as the agent should read it. For a question with choices the
  * latest reply IS the answer — an earlier conflicting one was corrected by
@@ -24,35 +46,14 @@ function answerContext(answered) {
     const identity = answeredQuestionIds.length === 0
         ? ''
         : `question_id${answeredQuestionIds.length === 1 ? '' : 's'} ${answeredQuestionIds.join(', ')}, `;
-    const question = `question ${JSON.stringify(pending.question)}`;
+    const question = `question ${quoted(pending.question)}`;
     if (replies.length === 1 || pendingHasChoices(pending)) {
-        return `Notifai — ${identity}${question}; the user answered ${JSON.stringify(latest.text)}.`;
+        return `Notifai — ${identity}${question}; the user answered ${quoted(latest.text)}.`;
     }
-    const parts = replies.map((reply) => JSON.stringify(reply.text)).join(', then ');
+    const parts = replies.map((reply) => quoted(reply.text)).join(', then ');
     return (`Notifai — ${identity}${question}; the user answered in ${replies.length} parts, ` +
         `in the order written: ${parts}. Later parts extend or correct earlier ones.`);
 }
-/**
- * Every answer that has arrived, as one message. Several registered questions
- * may resolve in one hook pass; the agent reads them together, each answer
- * tied to the question that asked it, with a truthful note about anything
- * still waiting.
- */
-function acknowledgementCommand(requestId, textRequired = true) {
-    return textRequired
-        ? `notifai acknowledge ${requestId} --text <text>`
-        : `notifai acknowledge ${requestId}`;
-}
-/**
- * The acknowledgement is owed either way; only its text is conditional. So the
- * instruction never says "you may skip this" — it says what to run.
- */
-function acknowledgementDemand(textRequired) {
-    return textRequired
-        ? ' with non-empty text saying what concrete work you will do because of the reply; a bare acknowledgement is insufficient'
-        : ' exactly as shown; this account turned acknowledgement text off, so the receipt carries no words';
-}
-const ACKNOWLEDGEMENT_SCOPE = ' Once a request reports recorded or replayed, its acknowledgement is complete; do not repeat it for a later turn or unrelated event.';
 function acknowledgementContext(answered) {
     const due = answered.filter((entry) => entry.pending.request_id !== undefined);
     if (due.length === 0) {
@@ -77,22 +78,28 @@ function acknowledgementContext(answered) {
         commands +
         ACKNOWLEDGEMENT_SCOPE);
 }
+/**
+ * Every answer that has arrived, as one message. Several registered questions
+ * may resolve in one hook pass; the agent reads them together, each answer
+ * tied to the question that asked it, with a truthful note about anything
+ * still waiting.
+ */
 export function answersContext(answered, remaining) {
     const tail = remaining > 0
         ? ` (${remaining} more registered question${remaining === 1 ? ' is' : 's are'} still waiting for an answer.)`
         : '';
-    const guidance = acknowledgementContext(answered);
+    const guidance = acknowledgementContext(answered) + TRANSPORT_LIMIT;
     if (answered.length === 1) {
         return answerContext(answered[0]) + tail + guidance;
     }
     const lines = answered.map(({ pending, replies }) => {
         const latest = replies.at(-1);
         const answer = replies.length === 1 || pendingHasChoices(pending)
-            ? JSON.stringify(latest.text)
-            : `${replies.map((reply) => JSON.stringify(reply.text)).join(', then ')} (parts in the order written; later parts extend or correct earlier ones)`;
+            ? quoted(latest.text)
+            : `${replies.map((reply) => quoted(reply.text)).join(', then ')} (parts in the order written; later parts extend or correct earlier ones)`;
         const ids = [...new Set(latest.answers.map((entry) => entry.question_id))];
         const identity = ids.length === 0 ? '' : `question_id${ids.length === 1 ? '' : 's'} ${ids.join(', ')}: `;
-        return `- ${identity}${JSON.stringify(pending.question)} → ${answer}`;
+        return `- ${identity}${quoted(pending.question)} → ${answer}`;
     });
     return `Notifai — the user answered ${answered.length} questions:\n${lines.join('\n')}${tail}${guidance}`;
 }
@@ -250,7 +257,11 @@ export function recoverQueuedAnswers(sessionId, env) {
         ? archiveQueuedAnswers(current, current.accepted)
         : current);
 }
-export function clearAcknowledgementObligation(sessionId, env, requestId) {
+/** Forget one owed acknowledgement, dispatched by identifier: `sm_…` or a request id. */
+export function clearAcknowledgementObligation(sessionId, env, id) {
+    if (id.startsWith(SESSION_MESSAGE_ID_PREFIX))
+        return clearMessageAcknowledgement(sessionId, env, id);
+    const requestId = id;
     let cleared = false;
     updateSessionState(sessionId, env, (current) => {
         const due = current.acknowledgement_due ?? [];
@@ -272,13 +283,44 @@ export function clearAcknowledgementObligation(sessionId, env, requestId) {
     });
     return cleared;
 }
+function clearMessageAcknowledgement(sessionId, env, messageId) {
+    let cleared = false;
+    updateSessionState(sessionId, env, (current) => {
+        const due = current.message_acknowledgement_due ?? [];
+        const remaining = due.filter((entry) => entry.message_id !== messageId);
+        cleared = remaining.length !== due.length;
+        if (!cleared)
+            return current;
+        const next = { ...current };
+        if (remaining.length > 0)
+            next.message_acknowledgement_due = remaining;
+        else
+            delete next.message_acknowledgement_due;
+        return next;
+    });
+    return cleared;
+}
 export function acknowledgementBlockContext(due) {
+    const anyTextRequired = due.some((entry) => entry.text_required !== false);
     const commands = due
-        .map((entry) => `- ${entry.request_id}: \`${acknowledgementCommand(entry.request_id, entry.text_required !== false)}\``)
+        .map((entry) => {
+        const id = owedAcknowledgementId(entry);
+        return `- ${id}: \`${acknowledgementCommand(id, entry.text_required !== false)}\``;
+    })
         .join('\n');
-    const anyTextRequired = due.some((entry) => entry.text_required !== false);
-    return (`Notifai — required Agent Acknowledgement${due.length === 1 ? '' : 's'} still missing for request${due.length === 1 ? '' : 's'} ${due.map((entry) => entry.request_id).join(', ')}. ` +
-        `Before doing more resumed work or ending this turn, run ${due.length === 1 ? 'this command' : 'every command'}${acknowledgementDemand(anyTextRequired)}:\n${commands}` +
+    const requests = due.filter((entry) => !('message_id' in entry));
+    const messages = due.filter((entry) => 'message_id' in entry);
+    const subjects = [
+        ...(requests.length === 0
+            ? []
+            : [`request${requests.length === 1 ? '' : 's'} ${requests.map((entry) => entry.request_id).join(', ')}`]),
+        ...(messages.length === 0
+            ? []
+            : [`message${messages.length === 1 ? '' : 's'} ${messages.map((entry) => entry.message_id).join(', ')}`]),
+    ].join(' and ');
+    const cause = requests.length === 0 ? 'message' : 'reply';
+    return (`Notifai — required Agent Acknowledgement${due.length === 1 ? '' : 's'} still missing for ${subjects}. ` +
+        `Before doing more resumed work or ending this turn, run ${due.length === 1 ? 'this command' : 'every command'}${acknowledgementDemand(anyTextRequired, cause)}:\n${commands}` +
         ACKNOWLEDGEMENT_SCOPE);
 }
 /**
@@ -301,17 +343,17 @@ const MAX_ACKNOWLEDGEMENT_BLOCKS = 3;
 export function holdForAcknowledgement(ctx, sessionId, due, notes) {
     if (due.length === 0)
         return null;
-    const requestIds = due.map((entry) => entry.request_id);
+    const ids = subjectIds(due);
     const blocks = (readSessionState(sessionId, ctx.env).acknowledgement_blocks ?? 0) + 1;
     if (blocks > MAX_ACKNOWLEDGEMENT_BLOCKS) {
         // Drop the obligation with the reason recorded. The answer was already
         // delivered; what is lost is the agent's receipt for it, and the log is
         // where that loss stays visible.
-        for (const requestId of requestIds)
-            clearAcknowledgementObligation(sessionId, ctx.env, requestId);
+        for (const owed of due)
+            clearAcknowledgementObligation(sessionId, ctx.env, owedAcknowledgementId(owed));
         resetAcknowledgementBlocks(sessionId, ctx.env);
         gate(ctx, 'proceeding', 'acknowledgement-abandoned', {
-            request_ids: requestIds,
+            ...ids,
             blocks: blocks - 1,
             limit: MAX_ACKNOWLEDGEMENT_BLOCKS,
         });
@@ -322,11 +364,20 @@ export function holdForAcknowledgement(ctx, sessionId, due, notes) {
         ...current,
         acknowledgement_blocks: blocks,
     }));
-    gate(ctx, 'held', 'acknowledgement-required', { request_ids: requestIds, blocks });
+    gate(ctx, 'held', 'acknowledgement-required', { ...ids, blocks });
     return {
         stdout: stopAnswerOutput(acknowledgementBlockContext(due)),
         notes,
-        log: { stage: 'acknowledgement-required', request_ids: requestIds },
+        log: { stage: 'acknowledgement-required', ...ids },
+    };
+}
+/** Log fields naming owed acknowledgements; `request_ids` keeps its released meaning. */
+function subjectIds(due) {
+    const requestIds = due.flatMap((entry) => ('message_id' in entry ? [] : [entry.request_id]));
+    const messageIds = due.flatMap((entry) => ('message_id' in entry ? [entry.message_id] : []));
+    return {
+        ...(requestIds.length === 0 && messageIds.length > 0 ? {} : { request_ids: requestIds }),
+        ...(messageIds.length === 0 ? {} : { message_ids: messageIds }),
     };
 }
 /** A turn that was not held resets the streak; only consecutive holds count. */
@@ -339,15 +390,21 @@ export function resetAcknowledgementBlocks(sessionId, env) {
         return next;
     });
 }
+/**
+ * Ask the service which owed acknowledgements now exist and forget those.
+ * Returns what is still owed; a failed check counts as still owed.
+ */
 export async function reconcileAcknowledgementObligations(ctx, sessionId, due) {
     const unresolved = [];
     for (const obligation of due) {
+        const id = owedAcknowledgementId(obligation);
         try {
-            const snapshot = await ctx.client.agentAcknowledgement(obligation.request_id, {
-                waitSeconds: 0,
-            });
-            if (snapshot.agent_acknowledgement !== null) {
-                clearAcknowledgementObligation(sessionId, ctx.env, obligation.request_id);
+            const acknowledgement = 'message_id' in obligation
+                ? (await ctx.client.sessionMessageAcknowledgement(obligation.message_id)).agent_acknowledgement
+                : (await ctx.client.agentAcknowledgement(obligation.request_id, { waitSeconds: 0 }))
+                    .agent_acknowledgement;
+            if (acknowledgement !== null) {
+                clearAcknowledgementObligation(sessionId, ctx.env, id);
             }
             else {
                 unresolved.push(obligation);
@@ -359,7 +416,7 @@ export async function reconcileAcknowledgementObligations(ctx, sessionId, due) {
                 verdict: 'held',
                 reason: 'acknowledgement-required',
                 stage: 'reconcile-failed',
-                request_id: obligation.request_id,
+                ...('message_id' in obligation ? { message_id: id } : { request_id: id }),
                 message: err instanceof Error ? err.message : String(err),
             });
         }