@rudderhq/cli 0.7.10 → 0.7.11

package/dist/index.js

@@ -441,6 +441,7 @@ var init_constants = __esm({
       "rudder_goal_list",
       "rudder_goal_context",
       "rudder_goal_progress",
+      "rudder_goal_checkpoint",
       "rudder_goal_change_propose",
       "rudder_goal_result_propose",
       "rudder_issue_get",
@@ -4024,7 +4025,7 @@ var init_workspace_backup2 = __esm({
 
 // ../packages/shared/dist/validators/goal.js
 import { z as z27 } from "zod";
-var jsonRecord, evidenceRefSchema, sha256HexSchema, criterionSchema, continuationSchema, planPayloadSchema, createGoalSchema, updateGoalSchema, activateGoalSchema, goalStartPacketSchema, previewGoalStartSchema, startGoalSchema, createGoalActivitySchema, assignGoalOwnerSchema, goalFeedbackAttachmentSchema, createGoalFeedbackSchema, goalContractPatchSchema, createGoalChangeProposalSchema, decideGoalChangeProposalSchema, goalEvaluationCandidateFields, goalEvaluationCandidateSchema, createGoalResultProposalSchema, acceptGoalResultProposalSchema, rejectGoalResultProposalSchema, evaluateGoalSchema, setGoalFocusSchema;
+var jsonRecord, evidenceRefSchema, sha256HexSchema, criterionSchema, continuationSchema, goalPlanPayloadSchema, createGoalSchema, updateGoalSchema, activateGoalSchema, goalStartPacketSchema, previewGoalStartSchema, startGoalSchema, createGoalCheckpointSchema, goalCheckpointSchema, createGoalActivitySchema, assignGoalOwnerSchema, goalFeedbackAttachmentSchema, createGoalFeedbackSchema, goalContractPatchSchema, createGoalChangeProposalSchema, decideGoalChangeProposalSchema, goalEvaluationCandidateFields, goalEvaluationCandidateSchema, createGoalResultProposalSchema, acceptGoalResultProposalSchema, rejectGoalResultProposalSchema, evaluateGoalSchema, setGoalFocusSchema;
 var init_goal = __esm({
   "../packages/shared/dist/validators/goal.js"() {
     "use strict";
@@ -4044,7 +4045,7 @@ var init_goal = __esm({
       summary: z27.string().trim().min(1),
       wakeCondition: z27.string().trim().min(1).optional().nullable()
     });
-    planPayloadSchema = z27.object({
+    goalPlanPayloadSchema = z27.object({
       summary: z27.string().trim().min(1),
       hypotheses: z27.array(z27.unknown()).optional().default([]),
       selectedPaths: z27.array(z27.unknown()).optional().default([]),
@@ -4084,7 +4085,7 @@ var init_goal = __esm({
       actionDeadline: z27.coerce.date().optional().nullable(),
       evaluationDeadline: z27.coerce.date().optional().nullable(),
       initialContinuation: continuationSchema,
-      initialPlan: planPayloadSchema
+      initialPlan: goalPlanPayloadSchema
     }).superRefine((value, ctx) => {
       if (value.evaluationDeadline && value.actionDeadline && value.evaluationDeadline < value.actionDeadline) {
         ctx.addIssue({ code: z27.ZodIssueCode.custom, path: ["evaluationDeadline"], message: "Evaluation deadline must not precede action deadline" });
@@ -4125,6 +4126,15 @@ var init_goal = __esm({
       allowCapabilityMismatch: z27.boolean().optional(),
       draftGoalId: z27.string().uuid().optional()
     }).strict();
+    createGoalCheckpointSchema = z27.object({
+      summary: z27.string().trim().min(1),
+      evidenceRefs: z27.array(evidenceRefSchema).max(100),
+      expectedPlanRevision: z27.number().int().positive(),
+      plan: goalPlanPayloadSchema.optional(),
+      continuation: continuationSchema,
+      idempotencyKey: z27.string().trim().min(1)
+    }).strict();
+    goalCheckpointSchema = createGoalCheckpointSchema.extend({ goal: z27.string().uuid() });
     createGoalActivitySchema = z27.object({
       summary: z27.string().trim().min(1),
       activityKind: z27.enum(GOAL_ACTIVITY_KINDS).optional().nullable(),
@@ -4790,6 +4800,7 @@ var init_short_refs = __esm({
     "use strict";
     SHORT_REF_PREFIX_BY_KIND = {
       agent: "agt",
+      chat: "cht",
       issue_comment: "cmt"
     };
     SHORT_REF_KIND_BY_PREFIX = Object.fromEntries(Object.entries(SHORT_REF_PREFIX_BY_KIND).map(([kind, prefix]) => [prefix, kind]));
@@ -5018,6 +5029,7 @@ var init_dist = __esm({
     init_agent_issue_creation();
     init_validators();
     init_validators();
+    init_goal();
     init_agent_url_key();
     init_api();
     init_markdown_source_boundary();
@@ -9343,6 +9355,15 @@ var RUDDER_MCP_TOOL_DESCRIPTORS = [
     "requiresAgentId": true,
     "attachesRunIdWhenAvailable": true
   },
+  {
+    "capabilityId": "goal.checkpoint",
+    "name": "rudder_goal_checkpoint",
+    "description": "Atomically persist a Goal checkpoint, optional Plan revision, continuation, checkpoint activity, and eligible automatic continuation wake.",
+    "mutating": true,
+    "requiresOrgId": false,
+    "requiresAgentId": true,
+    "attachesRunIdWhenAvailable": true
+  },
   {
     "capabilityId": "goal.change.propose",
     "name": "rudder_goal_change_propose",
@@ -10459,6 +10480,44 @@ function coreMcpInputSchema(id) {
         },
         idempotencyKey: string("Stable key for safe retry.", { maxLength: 500 })
       }, ["goal", "summary", "evidenceRefs", "idempotencyKey"]);
+    case "goal.checkpoint":
+      return schema({
+        goal,
+        summary: string("Plain-language bounded-run checkpoint summary."),
+        evidenceRefs: {
+          type: "array",
+          description: "URI-like references to artifacts, measurements, or other supporting evidence.",
+          maxItems: 100,
+          items: string("URI-like evidence reference.", { maxLength: 8192 })
+        },
+        expectedPlanRevision: number("Plan revision read before this checkpoint.", 1, 1e9),
+        plan: {
+          type: "object",
+          description: "Optional complete next Plan revision; omit when the current Plan remains valid.",
+          additionalProperties: false,
+          properties: {
+            summary: string("Plan summary."),
+            hypotheses: { type: "array", maxItems: 1e3, items: {} },
+            selectedPaths: { type: "array", maxItems: 1e3, items: {} },
+            rejectedPaths: { type: "array", maxItems: 1e3, items: {} },
+            sequencing: { type: "array", maxItems: 1e3, items: {} },
+            budgetAllocations: { type: "object", additionalProperties: true },
+            invalidationConditions: { type: "array", maxItems: 1e3, items: {} }
+          },
+          required: ["summary"]
+        },
+        continuation: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            kind: string("Continuation policy.", { enum: ["commitment", "wait", "decision", "verification"] }),
+            summary: string("What should happen next or what is awaited."),
+            wakeCondition: { oneOf: [{ type: "string", minLength: 1 }, { type: "null" }] }
+          },
+          required: ["kind", "summary"]
+        },
+        idempotencyKey: string("Stable key for safe retry.", { maxLength: 500 })
+      }, ["goal", "summary", "evidenceRefs", "expectedPlanRevision", "continuation", "idempotencyKey"]);
     case "goal.change.propose":
       return schema({
         goal,
@@ -11121,6 +11180,18 @@ var AGENT_CLI_CAPABILITIES = [
     requiresRunId: true,
     attachesRunIdWhenAvailable: true
   },
+  {
+    id: "goal.checkpoint",
+    command: "rudder goal checkpoint <goal-id> --summary <text> --evidence-refs <json> --expected-plan-revision <n> --continuation <json> --idempotency-key <key>",
+    category: "goal",
+    description: "Atomically persist a Goal checkpoint, optional Plan revision, continuation, checkpoint activity, and eligible automatic continuation wake.",
+    mutating: true,
+    contract: "agent-v1",
+    requiresOrgId: false,
+    requiresAgentId: true,
+    requiresRunId: true,
+    attachesRunIdWhenAvailable: true
+  },
   {
     id: "goal.change.propose",
     command: "rudder goal change propose <goal-id> --contract-revision <n> --after-contract <json> --rationale <text> --idempotency-key <key>",
@@ -12131,7 +12202,7 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "chat.get",
-    command: "rudder chat get <chat-id>",
+    command: "rudder chat get <chat-id-or-cht-ref>",
     category: "chat",
     description: "Read one chat conversation record.",
     mutating: false,
@@ -12143,7 +12214,7 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "chat.messages",
-    command: "rudder chat messages <chat-id> [--limit <n>] [--cursor <cursor>] [--include-transcript]",
+    command: "rudder chat messages <chat-id-or-cht-ref> [--limit <n>] [--cursor <cursor>] [--include-transcript]",
     category: "chat",
     description: "Read bounded chat messages with page cursors; transcript output is omitted unless requested.",
     mutating: false,
@@ -12155,7 +12226,7 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "chat.transcript",
-    command: "rudder chat transcript <chat-id> [--limit <n>] [--cursor <cursor>] [--max-output-chars <n>]",
+    command: "rudder chat transcript <chat-id-or-cht-ref> [--limit <n>] [--cursor <cursor>] [--max-output-chars <n>]",
     category: "chat",
     description: "Read paginated chat messages with assistant transcript entries clipped in human output.",
     mutating: false,
@@ -12167,7 +12238,7 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "chat.read",
-    command: "rudder chat read <chat-id> [--turn-limit <n>] [--cursor <cursor>] [--include-output]",
+    command: "rudder chat read <chat-id-or-cht-ref> [--turn-limit <n>] [--cursor <cursor>] [--include-output]",
     category: "chat",
     description: "Read a bounded recent-message snapshot for one chat with page cursors.",
     mutating: false,
@@ -12191,7 +12262,7 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "chat.send",
-    command: "rudder chat send <chat-id> --body <text>",
+    command: "rudder chat send <chat-id-or-cht-ref> --body <text>",
     category: "chat",
     description: "Send an agent-authored message directly to the operator in a chat.",
     mutating: true,
@@ -12203,7 +12274,7 @@ var AGENT_CLI_CAPABILITIES = [
   },
   {
     id: "chat.archive",
-    command: "rudder chat archive <chat-id>",
+    command: "rudder chat archive <chat-id-or-cht-ref>",
     category: "chat",
     description: "Archive a chat conversation without deleting it.",
     mutating: true,
@@ -12619,6 +12690,7 @@ var LEGACY_ARGUMENT_ALIASES = {
   },
   "goal.context": { goalId: "goal" },
   "goal.progress": { goalId: "goal" },
+  "goal.checkpoint": { goalId: "goal" },
   "goal.change.propose": { goalId: "goal" },
   "goal.result.propose": { goalId: "goal" },
   "issue.get": { issueId: "issue" },
@@ -13077,6 +13149,21 @@ async function callToolDirectlyIfSupported(toolName, rawArgs, env, signal) {
         payload
       ));
     }
+    case "goal.checkpoint": {
+      const goalId = requiredAnyString(input, ["goal", "goalId"]);
+      const payload = createGoalCheckpointSchema.parse({
+        summary: requiredString(input, "summary"),
+        evidenceRefs: input.evidenceRefs,
+        expectedPlanRevision: input.expectedPlanRevision,
+        plan: input.plan,
+        continuation: input.continuation,
+        idempotencyKey: requiredString(input, "idempotencyKey")
+      });
+      return success(await api.post(
+        `/api/goals/${encodeURIComponent(goalId)}/checkpoint`,
+        payload
+      ));
+    }
     case "goal.change.propose": {
       const payload = createGoalChangeProposalSchema.parse({
         expectedContractRevision: input.contractRevision,
@@ -13476,6 +13563,25 @@ function cliArgsForCapability(capabilityId, input, tempFiles, env) {
       pushOptional(args, "--activity-kind", input.activityKind);
       return args;
     }
+    case "goal.checkpoint": {
+      const args = [
+        "goal",
+        "checkpoint",
+        requiredAnyString(input, ["goal", "goalId"]),
+        "--summary",
+        requiredString(input, "summary"),
+        "--evidence-refs",
+        JSON.stringify(input.evidenceRefs),
+        "--expected-plan-revision",
+        String(input.expectedPlanRevision),
+        "--continuation",
+        JSON.stringify(input.continuation),
+        "--idempotency-key",
+        requiredString(input, "idempotencyKey")
+      ];
+      if (input.plan !== void 0) args.push("--plan", JSON.stringify(input.plan));
+      return args;
+    }
     case "goal.change.propose": {
       const args = [
         "goal",
@@ -15057,17 +15163,99 @@ function asString(value, fallback) {
 }
 
 // ../packages/agent-runtime-utils/dist/server-utils.prompts.js
-var RUDDER_GOAL_RUNTIME_BOUNDARY = `This is a Rudder product Goal, not a Codex internal goal. Do not call Codex \`create_goal\`, \`update_goal\`, or \`get_goal\` for it; those tools do not manage Rudder Goals. If the Goal packet names an exact managed Rudder tool, call that typed tool directly. Do not load \`rudder-docs\`, inspect skill files, or run discovery commands merely to confirm a tool that the packet already names. If the Rudder Goal context is missing or stale, report the named blocker and request refreshed context instead of using shell, Bash, curl, or the \`rudder\` CLI to retrieve it.
+var RUDDER_GOAL_RUNTIME_BOUNDARY = `This is a Rudder product Goal, not a Codex internal goal. Do not call Codex \`create_goal\`, \`update_goal\`, or \`get_goal\` for it; those tools do not manage Rudder Goals.
+
+Treat the supplied Goal Runtime Context as the current wake snapshot. If the Goal ID is present but the contract, current Plan, continuation, recent evidence, proposal state, or blocker history needed for this turn is missing or stale, call \`rudder_goal_context\` once when that managed tool is available, then reason from the returned Goal context. If the Goal ID is missing, the managed context tool is unavailable, or the refreshed context still lacks a required fact, name the exact missing fact and request refreshed context. Missing context is not by itself a validated blocked conclusion.
+
+If the Goal packet or this protocol names an exact managed Rudder tool, call that typed tool directly. Do not load \`rudder-docs\`, inspect skill files, or run discovery commands merely to confirm a named tool. Do not use shell, Bash, curl, or the \`rudder\` CLI to read or mutate Goal state.
+
+Use only tools that are actually available in the runtime. Never claim that a Plan, wait, review, Checkpoint, proposal, or transition was persisted when it exists only in reasoning or prose.
+
+Record meaningful evidence-backed advancement with \`rudder_goal_progress\`; the tool automatically attributes progress to this Run. If evidence shows the Goal contract itself must change, use \`rudder_goal_change_propose\` so a human can review the exact delta; never silently redefine the outcome or boundaries. When the outcome is ready for review, use \`rudder_goal_result_propose\` with the current contract revision and supporting evidence. A human must accept every terminal Goal result. A Result Proposal requests acceptance; it does not let the runtime mark, close, or claim the Goal complete.`;
+var RUDDER_GOAL_ADVANCEMENT_PROTOCOL = `## Goal Advancement Protocol
+
+Use this as a phase router, not a checklist to replay mechanically. Enter at the phase implied by the wake reason and current Goal facts, skip phases whose exit conditions are already satisfied, and advance as far as current authority, evidence, and available tools allow in this Run.
+
+### Phase 1 - Reconstruct the current state
+
+- Read the accepted Contract, current persisted Plan, current continuation, latest relevant Evidence and feedback, open proposals or reviews, deadlines, and autonomy envelope.
+- Keep three things separate: the Contract defines the outcome and boundaries; the Plan is the current mutable strategy; a bounded Run is one attempt under that Plan.
+- Treat the recorded continuation as the current handoff hypothesis, not an instruction to ignore newer Evidence or feedback.
+- Resolve missing or stale context through the managed context rule above before making a consequential Goal mutation, a three-turn blocker judgment, or a Result Proposal.
+
+### Phase 2 - Check that the Goal is executable
+
+- An active Goal is already human-confirmed. Do not restart broad Goal shaping on every wake.
+- Check whether the outcome, required criteria, evaluation boundary, evidence expectations, authority, and next continuation are concrete enough for the next bounded decision.
+- Ask only for a missing fact that materially changes execution. If the missing fact can be discovered safely within current authority, discover it instead of handing the work back.
+- If only the strategy must change, stay inside the Contract and Replan. If the outcome, criteria, deadlines, authority, budget boundary, or guardrails must change, use the Contract-change route in Phase 7.
+
+### Phase 3 - Plan or Replan
 
-Record meaningful evidence-backed advancement with \`rudder_goal_progress\`; the tool automatically attributes progress to this Run. If evidence shows the Goal contract itself must change, use \`rudder_goal_change_propose\` so a human can review the exact delta; never silently redefine the outcome or boundaries. When the outcome is ready for review, use \`rudder_goal_result_propose\` with the current contract revision and supporting evidence. Do not use shell, Bash, curl, or the \`rudder\` CLI for these actions.
+- State the current Goal gap, the working hypothesis, one bounded next commitment, the Evidence it should produce, and the stop or invalidation condition.
+- Prefer a commitment that can produce decision-relevant Evidence in this Run. Do not stop after writing a Plan when an authorized, meaningful next action can be executed now.
+- Replan when new Evidence, feedback, a failed assumption, a review finding, or a changed Contract invalidates the current path. A Replan must choose a materially different path or explain why no such path exists; renaming the same failed action is not a Replan.
+- Plan and Replan changes remain Agent-owned while they stay inside the accepted autonomy envelope. They do not silently revise the Goal Contract.
+- Persist a Plan/Replan only through a real named Goal Plan mechanism. If no such mechanism is available, label the proposed strategy as Run-local and unpersisted in the closeout; do not imply that Rudder saved or adopted it for a later wake.
 
-A human must accept every terminal Goal result. A Result Proposal requests acceptance; it does not let the runtime mark, close, or claim the Goal complete.`;
+### Phase 4 - Run an optional Plan or Replan review
+
+- Invoke a Plan/Replan review only when the Contract, continuation, risk policy, or explicit human instruction requires it and a real Review or Verification mechanism is available.
+- The review checks assumptions, material risks, authority boundaries, and whether the proposed commitment can produce useful Evidence.
+- A Reviewer returns findings; it does not become the Goal Owner, approve a Contract change, perform the Owner's work by reviewing it, or replace final human Acceptance.
+- If review is required but no review mechanism is available, report that exact unpersisted gate. Do not invent a completed review.
+
+### Phase 5 - Execute one bounded commitment
+
+- Perform or delegate one coherent, bounded attempt through the owning work domain. Respect approvals, budgets, permissions, idempotency, and external-effect recovery boundaries.
+- Preserve candidate, environment, and evidence identity across action and verification. Do not retry an external effect whose outcome is unknown.
+- A Run ending, a task completing, or an artifact existing is not Goal completion. It is an observation to evaluate against the Contract.
+
+### Phase 6 - Observe and checkpoint
+
+- Separate activity (what was attempted), output (what was produced), and Evidence (what proves an external or criterion-relevant fact).
+- Compare fresh Evidence and feedback with every affected required criterion, the current hypothesis, guardrails, and deadlines.
+- Call \`rudder_goal_progress\` only for meaningful advancement, Evidence, or a named bottleneck backed by valid evidence references. Do not manufacture an evidence reference to record narration.
+- Treat the resulting judgment as the Checkpoint for routing. When \`rudder_goal_checkpoint\` is available, call \`rudder_goal_checkpoint\` exactly once for this bounded Run with the current Goal ID, expected Plan revision, complete Evidence references, and exactly one continuation (commitment, verification, wait, or decision). Include a full next Plan payload only when Replan changed the strategy. Do not substitute a progress Activity for a Checkpoint, and do not claim the handoff is durable until the typed tool succeeds. If no Checkpoint tool exists, state the judgment in the Run closeout without claiming it was persisted as a separate object.
+
+### Phase 7 - Choose exactly one primary continuation route
+
+- **Continue:** the Plan is still viable; execute the next bounded commitment now when possible.
+- **Replan:** Evidence or feedback invalidated the current path; return to Phase 3.
+- **Wait:** name the external fact, event, time, or actor being awaited, plus the resume trigger, expiry, and safe fallback. A known wait is not blocked. Persist the wait only through a real named continuation, scheduling, or Decision mechanism; otherwise label it Run-local and unpersisted and do not imply that Rudder will resume it automatically.
+- **Human decision:** provide the exact question, affected boundary, Evidence, recommendation, options, response deadline, and safe fallback. Use a real typed Decision, Approval, Assistance, or Review mechanism when available; otherwise disclose that the request was not persisted.
+- **Contract change:** call \`rudder_goal_change_propose\` with the current contract revision, exact before/after meaning, rationale, and supporting Evidence. Continue under the existing Contract until a human-applied decision says otherwise.
+- **Blocked audit:** use Phase 8. Do not transfer responsibility on the first failure.
+- **Result Proposal:** use Phase 9 only when every required criterion can be honestly mapped to fresh Evidence or an explicit non-success verdict.
+
+### Phase 8 - Audit a possible block
+
+- Do not mark or claim the Goal blocked the first time a blocker appears.
+- If the same blocker persists for three consecutive Goal turns, first perform a Replan audit and look for a materially different path.
+- If Replan finds a viable path, continue through that path.
+- If Replan still cannot produce meaningful progress, report the Goal as operationally blocked and ask for the exact human input or external-state change required.
+- Resuming after a blocked conclusion starts a fresh three-turn audit.
+- Do not use blocked merely because the work is hard, slow, uncertain, incomplete, or would benefit from clarification.
+- Judge whether the blocker is materially the same from recent Goal history; no blocker fingerprint schema is required. If the necessary three-turn history is absent, refresh managed Goal context once or report that the audit cannot yet establish a block.
+
+### Phase 9 - Review and propose the result
+
+- Build a criterion-to-Evidence packet with the current contract revision, evidence identity and freshness, guardrail state, unresolved risk, and the mode-specific proposed result.
+- If policy requires a Result review, route the packet through the available Review or Verification mechanism first. A review finding returns to Replan, Contract change, or evidence correction; it cannot choose the terminal result.
+- Call \`rudder_goal_result_propose\` only after the evidence packet passes required preflight and any required review. No Evidence means no successful terminal proposal.
+- Stop execution while a Result Proposal is ready for human Acceptance. Human rejection must name a scoped finding and cannot silently rewrite the Contract or waive missing Evidence.
+
+### Required turn closeout
+
+Before ending the Run, state: the phase reached, what materially changed, the Evidence observed or still missing, the primary continuation route, and the next responsible actor or resume trigger. Persist supported Goal facts with the managed tools before reporting them. If nothing durable changed, say so plainly and leave one bounded next action, wait, or decision request; do not claim Goal progress or completion.`;
 var GOAL_STARTED_PROMPT_TEMPLATE = `You are agent {{agent.id}} ({{agent.name}}). A Goal has started and you are responsible for advancing it.
 
 {{context.rudderWorkspace.orgResourcesPrompt}}
 
 ${RUDDER_GOAL_RUNTIME_BOUNDARY}
 
+${RUDDER_GOAL_ADVANCEMENT_PROTOCOL}
+
 ## Goal Runtime Context
 
 **Goal:** {{context.goalRuntime.goalTitle}}
@@ -15079,16 +15267,28 @@ ${RUDDER_GOAL_RUNTIME_BOUNDARY}
 **Current contract:**
 {{context.goalRuntime.currentContract}}
 
+**Current Plan:**
+{{context.goalRuntime.currentPlan}}
+
 **Continuation:**
 {{context.goalRuntime.continuation}}
 
-Advance this Goal from the current contract and continuation. Preserve the stated outcome and contract boundaries; do not silently redefine them.`;
+**Latest checkpoint facts:**
+{{context.goalRuntime.latestCheckpoint}}
+
+## Wake Entry - Goal Started
+
+Start at Plan/Replan because activation already confirmed the Contract. Validate and use the persisted initial Plan before replacing it. Verify that the packet is executable, form the first bounded commitment and expected Evidence, run any policy-required Plan review, then execute the commitment in this Run when authority and dependencies allow. Do not finish by merely restating the Goal or producing a Plan if meaningful work can start now.
+
+Preserve the stated outcome and Contract boundaries. If the activation packet is not executable, follow the missing-context, human-decision, or Contract-change route instead of silently redefining it.`;
 var GOAL_FEEDBACK_PROMPT_TEMPLATE = `You are agent {{agent.id}} ({{agent.name}}). New feedback requires your review on a Goal you own.
 
 {{context.rudderWorkspace.orgResourcesPrompt}}
 
 ${RUDDER_GOAL_RUNTIME_BOUNDARY}
 
+${RUDDER_GOAL_ADVANCEMENT_PROTOCOL}
+
 ## Goal Runtime Context
 
 **Goal:** {{context.goalRuntime.goalTitle}}
@@ -15100,9 +15300,15 @@ ${RUDDER_GOAL_RUNTIME_BOUNDARY}
 **Current contract:**
 {{context.goalRuntime.currentContract}}
 
+**Current Plan:**
+{{context.goalRuntime.currentPlan}}
+
 **Continuation:**
 {{context.goalRuntime.continuation}}
 
+**Latest checkpoint facts:**
+{{context.goalRuntime.latestCheckpoint}}
+
 ## Goal Feedback
 
 **Feedback ID:** {{context.goalRuntime.feedbackId}}
@@ -15110,13 +15316,25 @@ ${RUDDER_GOAL_RUNTIME_BOUNDARY}
 **Feedback body:**
 {{context.goalRuntime.feedbackBody}}
 
-Review the feedback against the current Goal contract, then continue from the recorded continuation. Treat any outcome or contract change as an explicit proposal instead of silently changing the Goal.`;
+## Wake Entry - Goal Feedback
+
+Classify the feedback before acting:
+
+- new fact or Evidence -> observe and checkpoint;
+- strategy guidance inside the Contract -> Plan/Replan;
+- outcome, criteria, boundary, deadline, authority, or guardrail change -> Contract-change proposal;
+- review or result finding -> scoped remediation, evidence correction, or Replan;
+- question or clarification -> answer it without treating it as implicit authorization.
+
+Reconcile the feedback with newer Goal facts, then continue from the selected route in this Run when possible. Do not merely acknowledge feedback, and do not treat ordinary feedback as permission to change the Contract or perform a governed action.`;
 var GOAL_CHANGE_DECIDED_PROMPT_TEMPLATE = `You are agent {{agent.id}} ({{agent.name}}). A human decided a proposed change to a Goal you own.
 
 {{context.rudderWorkspace.orgResourcesPrompt}}
 
 ${RUDDER_GOAL_RUNTIME_BOUNDARY}
 
+${RUDDER_GOAL_ADVANCEMENT_PROTOCOL}
+
 ## Goal Runtime Context
 
 **Goal:** {{context.goalRuntime.goalTitle}}
@@ -15128,9 +15346,15 @@ ${RUDDER_GOAL_RUNTIME_BOUNDARY}
 **Current contract:**
 {{context.goalRuntime.currentContract}}
 
+**Current Plan:**
+{{context.goalRuntime.currentPlan}}
+
 **Continuation:**
 {{context.goalRuntime.continuation}}
 
+**Latest checkpoint facts:**
+{{context.goalRuntime.latestCheckpoint}}
+
 ## Goal Change Decision
 
 **Decision:** {{context.goalRuntime.decision}}
@@ -15139,7 +15363,46 @@ ${RUDDER_GOAL_RUNTIME_BOUNDARY}
 **Decision note:**
 {{context.goalRuntime.decisionNote}}
 
-Continue from the current Goal contract and this human decision. Do not apply a rejected change or silently reinterpret the decision.`;
+## Wake Entry - Goal Change Decision
+
+- If the decision is approved and applied, treat the supplied latest Contract revision as authoritative, invalidate Plan assumptions tied to the prior revision, and Replan before the next bounded commitment.
+- If the proposal was rejected, preserve the current Contract, use the decision note as feedback, and find a viable path inside the accepted boundaries. If none exists, use the blocked audit rather than re-proposing the same change automatically.
+- If the proposal is superseded, cancelled, stale, or otherwise not applied, do not assume its patch changed the Contract; refresh managed Goal context when the authoritative revision is unclear.
+
+Continue from the resulting Contract and decision state in this Run when possible. Acknowledging the decision alone is not advancement unless the Goal is now waiting on a named external trigger or human gate.`;
+var GOAL_CONTINUATION_PROMPT_TEMPLATE = `You are agent {{agent.id}} ({{agent.name}}). A prior bounded Goal Run persisted a checkpoint and this continuation wake is ready.
+
+{{context.rudderWorkspace.orgResourcesPrompt}}
+
+${RUDDER_GOAL_RUNTIME_BOUNDARY}
+
+${RUDDER_GOAL_ADVANCEMENT_PROTOCOL}
+
+## Goal Runtime Context
+
+**Goal:** {{context.goalRuntime.goalTitle}}
+**Goal ID:** {{context.goalRuntime.goalId}}
+
+**Goal outcome:**
+{{context.goalRuntime.goalOutcome}}
+
+**Current contract:**
+{{context.goalRuntime.currentContract}}
+
+**Current Plan:**
+{{context.goalRuntime.currentPlan}}
+
+**Continuation:**
+{{context.goalRuntime.continuation}}
+
+**Latest checkpoint facts:**
+{{context.goalRuntime.latestCheckpoint}}
+
+## Wake Entry - Goal Continuation
+
+The prior Run has already persisted the checkpoint named above. Reconstruct the current Contract, Plan revision, Evidence, and continuation before acting. Continue only the checkpoint's bounded commitment or verification when its wake condition is satisfied and the Goal is still active. Do not replay the prior action blindly, create a duplicate checkpoint for the same effect, or treat checkpoint persistence as Goal completion.
+
+If the checkpoint instead records a wait or human decision, this wake is unexpected: do not invent authorization or execute the waiting action. Refresh managed Goal context, report the mismatch, and leave the Goal waiting for its named actor or external trigger. If a ready Result Proposal exists, stop and wait for human Acceptance.`;
 var ISSUE_ASSIGNEE_EXECUTION_RAIL = "Before doing issue-scoped execution as the assignee, check out the assigned issue. If checkout returns `409`, do not retry; stop and report the ownership conflict.";
 var ISSUE_ASSIGN_PROMPT_TEMPLATE = `You are agent {{agent.id}} ({{agent.name}}). You have been assigned to work on an issue.
 
@@ -16760,7 +17023,7 @@ function registerChatCommands(program) {
     { includeCompany: false }
   );
   addCommonClientOptions(
-    chat.command("get").description(getAgentCliCapabilityById("chat.get").description).argument("<chatId>", "Chat conversation ID").action(async (chatId, opts) => {
+    chat.command("get").description(getAgentCliCapabilityById("chat.get").description).argument("<chatId>", "Chat conversation UUID or cht_<uuid-prefix> short ref").action(async (chatId, opts) => {
       try {
         const ctx = resolveCommandContext(opts);
         const row = await ctx.api.get(`/api/chats/${encodeURIComponent(chatId)}`);
@@ -16771,7 +17034,7 @@ function registerChatCommands(program) {
     })
   );
   addCommonClientOptions(
-    chat.command("messages").description(getAgentCliCapabilityById("chat.messages").description).argument("<chatId>", "Chat conversation ID").option("--include-transcript", "Include assistant transcript entries").option("--include-output", "Alias for --include-transcript").option("--include-outputs", "Alias for --include-transcript").option("--limit <n>", "Maximum messages to print").option("--cursor <cursor>", "Stable message cursor returned in page.nextCursor").option("--max-output-chars <n>", "Maximum transcript output chars for human output", "1200").action(async (chatId, opts) => {
+    chat.command("messages").description(getAgentCliCapabilityById("chat.messages").description).argument("<chatId>", "Chat conversation UUID or cht_<uuid-prefix> short ref").option("--include-transcript", "Include assistant transcript entries").option("--include-output", "Alias for --include-transcript").option("--include-outputs", "Alias for --include-transcript").option("--limit <n>", "Maximum messages to print").option("--cursor <cursor>", "Stable message cursor returned in page.nextCursor").option("--max-output-chars <n>", "Maximum transcript output chars for human output", "1200").action(async (chatId, opts) => {
       try {
         const ctx = resolveCommandContext(opts);
         const page = await getChatMessagesPage(ctx, chatId, {
@@ -16789,7 +17052,7 @@ function registerChatCommands(program) {
     })
   );
   addCommonClientOptions(
-    chat.command("transcript").description(getAgentCliCapabilityById("chat.transcript").description).argument("<chatId>", "Chat conversation ID").option("--limit <n>", "Maximum messages to print").option("--cursor <cursor>", "Stable message cursor returned in page.nextCursor").option("--max-chars <n>", "Maximum transcript chars per message", "1200").option("--max-output-chars <n>", "Alias for --max-chars").action(async (chatId, opts) => {
+    chat.command("transcript").description(getAgentCliCapabilityById("chat.transcript").description).argument("<chatId>", "Chat conversation UUID or cht_<uuid-prefix> short ref").option("--limit <n>", "Maximum messages to print").option("--cursor <cursor>", "Stable message cursor returned in page.nextCursor").option("--max-chars <n>", "Maximum transcript chars per message", "1200").option("--max-output-chars <n>", "Alias for --max-chars").action(async (chatId, opts) => {
       try {
         const ctx = resolveCommandContext(opts);
         const page = await getChatMessagesPage(ctx, chatId, {
@@ -16808,15 +17071,15 @@ function registerChatCommands(program) {
     })
   );
   addCommonClientOptions(
-    chat.command("read").description(getAgentCliCapabilityById("chat.read").description).argument("<chatId>", "Chat conversation ID").option("--include-transcript", "Include assistant transcript entries").option("--include-output", "Alias for --include-transcript").option("--include-outputs", "Alias for --include-transcript").option("--limit <n>", "Maximum recent messages", "20").option("--turn-limit <n>", "Alias for --limit for chat turn snapshots").option("--cursor <cursor>", "Stable message cursor returned in page.nextCursor").option("--max-output-chars <n>", "Maximum transcript output chars for human output", "1200").addHelpText("after", formatExamplesAndCautions({
+    chat.command("read").description(getAgentCliCapabilityById("chat.read").description).argument("<chatId>", "Chat conversation UUID or cht_<uuid-prefix> short ref").option("--include-transcript", "Include assistant transcript entries").option("--include-output", "Alias for --include-transcript").option("--include-outputs", "Alias for --include-transcript").option("--limit <n>", "Maximum recent messages", "20").option("--turn-limit <n>", "Alias for --limit for chat turn snapshots").option("--cursor <cursor>", "Stable message cursor returned in page.nextCursor").option("--max-output-chars <n>", "Maximum transcript output chars for human output", "1200").addHelpText("after", formatExamplesAndCautions({
       examples: [
         {
           description: "Read a bounded conversation page with transcript output when needed:",
-          command: "rudder chat read <chat-id> --turn-limit 20 --include-output"
+          command: "rudder chat read <chat-id-or-cht-ref> --turn-limit 20 --include-output"
         },
         {
           description: "Continue from a stable cursor in scripts:",
-          command: "rudder chat read <chat-id> --cursor <nextCursor> --json"
+          command: "rudder chat read <chat-id-or-cht-ref> --cursor <nextCursor> --json"
         }
       ],
       cautions: [
@@ -16873,15 +17136,15 @@ function registerChatCommands(program) {
     { includeCompany: false }
   );
   addCommonClientOptions(
-    chat.command("send").description(getAgentCliCapabilityById("chat.send").description).argument("<chatId>", "Chat conversation ID").option("--body <text>", "Message body").option("--edit-user-message-id <id>", "Regenerate/edit from a prior user message").addHelpText("after", formatExamplesAndCautions({
+    chat.command("send").description(getAgentCliCapabilityById("chat.send").description).argument("<chatId>", "Chat conversation UUID or cht_<uuid-prefix> short ref").option("--body <text>", "Message body").option("--edit-user-message-id <id>", "Regenerate/edit from a prior user message").addHelpText("after", formatExamplesAndCautions({
       examples: [
         {
           description: "Append a short agent-authored status note:",
-          command: 'rudder chat send <chat-id> --body "Status: validation is running"'
+          command: 'rudder chat send <chat-id-or-cht-ref> --body "Status: validation is running"'
         },
         {
           description: "Send a longer or multiline note through stdin:",
-          command: "printf '%s\\n' 'Multiline note' | rudder chat send <chat-id>"
+          command: "printf '%s\\n' 'Multiline note' | rudder chat send <chat-id-or-cht-ref>"
         }
       ],
       cautions: [
@@ -16904,7 +17167,7 @@ function registerChatCommands(program) {
     })
   );
   addCommonClientOptions(
-    chat.command("archive").description(getAgentCliCapabilityById("chat.archive").description).argument("<chatId>", "Chat conversation ID").action(async (chatId, opts) => {
+    chat.command("archive").description(getAgentCliCapabilityById("chat.archive").description).argument("<chatId>", "Chat conversation UUID or cht_<uuid-prefix> short ref").action(async (chatId, opts) => {
       try {
         const ctx = resolveCommandContext(opts);
         const payload = updateChatConversationSchema.parse({ status: "archived" });
@@ -16948,7 +17211,7 @@ function filterChatSearchRows(rows, query, scope) {
 }
 function formatChatConversation(row) {
   return {
-    id: row.id,
+    id: row.shortRef ?? row.id,
     title: row.title,
     status: row.status,
     preferredAgentId: row.preferredAgentId ?? "-",
@@ -16959,7 +17222,7 @@ function formatChatConversation(row) {
 }
 function formatChatSearchResult(row, maxChars) {
   return {
-    id: row.id,
+    id: row.shortRef ?? row.id,
     title: row.title,
     status: row.status,
     lastMessageAt: row.lastMessageAt ?? "-",
@@ -18406,6 +18669,25 @@ function registerGoalCommands(program) {
       }
     })
   );
+  addCommonClientOptions(
+    goal.command("checkpoint").description(getAgentCliCapabilityById("goal.checkpoint").description).argument("<goalId>", "Goal ID from the current Goal Runtime Context").requiredOption("--summary <text>", "Checkpoint summary").requiredOption("--evidence-refs <json>", "JSON array of URI-like evidence references").requiredOption("--expected-plan-revision <n>", "Current Goal Plan revision").option("--plan <json>", "Optional next Plan revision payload").requiredOption("--continuation <json>", "JSON continuation payload").requiredOption("--idempotency-key <key>", "Stable key for safe retry").action(async (goalId, opts) => {
+      try {
+        const ctx = resolveCommandContext(opts);
+        const payload = createGoalCheckpointSchema.parse({
+          summary: opts.summary,
+          evidenceRefs: parseJsonArray(opts.evidenceRefs, "evidence refs"),
+          expectedPlanRevision: Number(opts.expectedPlanRevision),
+          ...opts.plan !== void 0 ? { plan: parseJsonObject3(opts.plan, "plan") } : {},
+          continuation: parseJsonObject3(opts.continuation, "continuation"),
+          idempotencyKey: opts.idempotencyKey
+        });
+        const checkpoint = await ctx.api.post(`/api/goals/${goalId}/checkpoint`, payload);
+        printOutput(checkpoint, { json: ctx.json });
+      } catch (err) {
+        handleCommandError(err);
+      }
+    })
+  );
   const change = goal.command("change").description("Goal contract change operations");
   addCommonClientOptions(
     change.command("propose").description(getAgentCliCapabilityById("goal.change.propose").description).argument("<goalId>", "Goal ID from the current Goal Runtime Context").requiredOption("--contract-revision <n>", "Current Goal contract revision").requiredOption("--after-contract <json>", "JSON object containing only proposed contract field changes").requiredOption("--rationale <text>", "Why the current Goal contract should change").option("--evidence-refs <json>", "JSON array of URI-like evidence references", "[]").requiredOption("--idempotency-key <key>", "Stable key for safe retry").action(async (goalId, opts) => {