cclaw-cli 0.5.3 → 0.5.5

package/dist/content/observe.js

@@ -1,12 +1,9 @@
 /**
- * Tool observation system — captures PreToolUse/PostToolUse events
- * to .cclaw/observations.jsonl for continuous learning.
+ * Hook helper scripts and harness hook JSON generators.
  *
- * observe.sh: reads hook JSON from stdin, extracts tool name + truncated I/O,
- * appends a JSONL line to .cclaw/observations.jsonl.
- *
- * summarize-observations.sh: run at session stop, reads recent observations,
- * identifies patterns, and appends new learnings to .cclaw/learnings.jsonl.
+ * This module still provides prompt/workflow/context guard scripts and
+ * cross-harness hook wiring. Observation pipeline scripts are retained only
+ * for backward compatibility and are not wired by default runtime generation.
  */
 import { RUNTIME_ROOT } from "../constants.js";
 import { RUNTIME_SHELL_DETECT_ROOT } from "./hooks.js";
@@ -39,7 +36,7 @@ INPUT=$(cat 2>/dev/null || echo '{}')
 TOOL="unknown"
 PAYLOAD=""
 if command -v jq >/dev/null 2>&1; then
-  TOOL=$(printf '%s' "$INPUT" | jq -r '.tool_name // .tool // "unknown"' 2>/dev/null || echo "unknown")
+  TOOL=$(printf '%s' "$INPUT" | jq -r '.tool_name // .tool // .toolName // .name // .id // .command // .tool.name // .tool.id // .input.tool_name // .input.tool // .input.toolName // .input.name // .input.id // .input.command // .input.tool.name // .input.tool.id // "unknown"' 2>/dev/null || echo "unknown")
   PAYLOAD=$(printf '%s' "$INPUT" | jq -r '.tool_input // .input // .arguments // .params // .payload // {} | tostring' 2>/dev/null || echo "")
 elif command -v python3 >/dev/null 2>&1; then
   TOOL=$(INPUT_JSON="$INPUT" python3 - <<'PY'
@@ -50,8 +47,40 @@ try:
     value = json.loads(os.environ.get("INPUT_JSON", "{}"))
 except Exception:
     value = {}
-tool = value.get("tool_name") or value.get("tool") or "unknown"
-print(tool if isinstance(tool, str) else "unknown")
+
+def pick_tool(payload):
+    if not isinstance(payload, dict):
+        return "unknown"
+    candidates = [
+        payload.get("tool_name"),
+        payload.get("tool"),
+        payload.get("toolName"),
+        payload.get("name"),
+        payload.get("id"),
+        payload.get("command")
+    ]
+    top_tool = payload.get("tool")
+    if isinstance(top_tool, dict):
+        candidates.extend([top_tool.get("name"), top_tool.get("id")])
+    nested = payload.get("input")
+    if isinstance(nested, dict):
+        candidates.extend([
+            nested.get("tool_name"),
+            nested.get("tool"),
+            nested.get("toolName"),
+            nested.get("name"),
+            nested.get("id"),
+            nested.get("command")
+        ])
+        nested_tool = nested.get("tool")
+        if isinstance(nested_tool, dict):
+            candidates.extend([nested_tool.get("name"), nested_tool.get("id")])
+    for candidate in candidates:
+        if isinstance(candidate, str) and candidate.strip():
+            return candidate.strip()
+    return "unknown"
+
+print(pick_tool(value))
 PY
 )
   PAYLOAD=$(printf '%s' "$INPUT")
@@ -70,7 +99,7 @@ REASONS=""
 
 case "$TOOL_LOWER" in
   write|edit|multiedit|delete|applypatch|runcommand|shell|terminal|execcommand)
-    if printf '%s' "$PAYLOAD_LOWER" | grep -Eq '\.cclaw/(state|artifacts|hooks|skills|commands|agents|runs|learnings)'; then
+    if printf '%s' "$PAYLOAD_LOWER" | grep -Eq '\.cclaw/(state|artifacts|hooks|skills|commands|agents|runs|knowledge)'; then
       REASONS="write_to_cclaw_runtime"
     fi
     ;;
@@ -146,7 +175,7 @@ INPUT=$(cat 2>/dev/null || echo '{}')
 TOOL="unknown"
 PAYLOAD=""
 if command -v jq >/dev/null 2>&1; then
-  TOOL=$(printf '%s' "$INPUT" | jq -r '.tool_name // .tool // "unknown"' 2>/dev/null || echo "unknown")
+  TOOL=$(printf '%s' "$INPUT" | jq -r '.tool_name // .tool // .toolName // .name // .id // .command // .tool.name // .tool.id // .input.tool_name // .input.tool // .input.toolName // .input.name // .input.id // .input.command // .input.tool.name // .input.tool.id // "unknown"' 2>/dev/null || echo "unknown")
   PAYLOAD=$(printf '%s' "$INPUT" | jq -r '.tool_input // .input // .arguments // .params // .payload // {} | tostring' 2>/dev/null || echo "")
 elif command -v python3 >/dev/null 2>&1; then
   TOOL=$(INPUT_JSON="$INPUT" python3 - <<'PY'
@@ -156,8 +185,40 @@ try:
     value = json.loads(os.environ.get("INPUT_JSON", "{}"))
 except Exception:
     value = {}
-tool = value.get("tool_name") or value.get("tool") or "unknown"
-print(tool if isinstance(tool, str) else "unknown")
+
+def pick_tool(payload):
+    if not isinstance(payload, dict):
+        return "unknown"
+    candidates = [
+        payload.get("tool_name"),
+        payload.get("tool"),
+        payload.get("toolName"),
+        payload.get("name"),
+        payload.get("id"),
+        payload.get("command")
+    ]
+    top_tool = payload.get("tool")
+    if isinstance(top_tool, dict):
+        candidates.extend([top_tool.get("name"), top_tool.get("id")])
+    nested = payload.get("input")
+    if isinstance(nested, dict):
+        candidates.extend([
+            nested.get("tool_name"),
+            nested.get("tool"),
+            nested.get("toolName"),
+            nested.get("name"),
+            nested.get("id"),
+            nested.get("command")
+        ])
+        nested_tool = nested.get("tool")
+        if isinstance(nested_tool, dict):
+            candidates.extend([nested_tool.get("name"), nested_tool.get("id")])
+    for candidate in candidates:
+        if isinstance(candidate, str) and candidate.strip():
+            return candidate.strip()
+    return "unknown"
+
+print(pick_tool(value))
 PY
 )
   PAYLOAD=$(printf '%s' "$INPUT")
@@ -527,7 +588,7 @@ INPUT=$(cat 2>/dev/null || echo '{}')
 TOOL="unknown"
 PAYLOAD=""
 if command -v jq >/dev/null 2>&1; then
-  TOOL=$(echo "$INPUT" | jq -r '.tool_name // .tool // "unknown"' 2>/dev/null || echo "unknown")
+  TOOL=$(echo "$INPUT" | jq -r '.tool_name // .tool // .toolName // .name // .id // .command // .tool.name // .tool.id // .input.tool_name // .input.tool // .input.toolName // .input.name // .input.id // .input.command // .input.tool.name // .input.tool.id // "unknown"' 2>/dev/null || echo "unknown")
   if [ "$PHASE" = "pre" ]; then
     PAYLOAD=$(echo "$INPUT" | jq -r --arg max "$MAX_LEN" '.tool_input // .input // {} | tostring | .[0:($max|tonumber)]' 2>/dev/null || echo "")
   else
@@ -1531,9 +1592,6 @@ export function claudeHooksJsonWithObservation() {
                         }, {
                             type: "command",
                             command: `bash ${RUNTIME_ROOT}/hooks/workflow-guard.sh`
-                        }, {
-                            type: "command",
-                            command: `bash ${RUNTIME_ROOT}/hooks/observe.sh pre`
                         }]
                 }],
             PostToolUse: [{
@@ -1541,24 +1599,14 @@ export function claudeHooksJsonWithObservation() {
                     hooks: [{
                             type: "command",
                             command: `bash ${RUNTIME_ROOT}/hooks/context-monitor.sh`
-                        }, {
-                            type: "command",
-                            command: `bash ${RUNTIME_ROOT}/hooks/observe.sh post`
                         }]
                 }],
             Stop: [{
-                    hooks: [
-                        {
-                            type: "command",
-                            command: `bash ${RUNTIME_ROOT}/hooks/summarize-observations.sh`,
-                            timeout: 15
-                        },
-                        {
+                    hooks: [{
                             type: "command",
                             command: `bash ${RUNTIME_ROOT}/hooks/stop-checkpoint.sh`,
                             timeout: 10
-                        }
-                    ]
+                        }]
                 }]
         }
     }, null, 2);
@@ -1586,21 +1634,12 @@ export function cursorHooksJsonWithObservation() {
                 }, {
                     matcher: "*",
                     command: `bash ${RUNTIME_ROOT}/hooks/workflow-guard.sh`
-                }, {
-                    matcher: "*",
-                    command: `bash ${RUNTIME_ROOT}/hooks/observe.sh pre`
                 }],
             postToolUse: [{
                     matcher: "*",
                     command: `bash ${RUNTIME_ROOT}/hooks/context-monitor.sh`
-                }, {
-                    matcher: "*",
-                    command: `bash ${RUNTIME_ROOT}/hooks/observe.sh post`
                 }],
-            stop: [
-                { command: `bash ${RUNTIME_ROOT}/hooks/summarize-observations.sh`, timeout: 15 },
-                { command: `bash ${RUNTIME_ROOT}/hooks/stop-checkpoint.sh`, timeout: 10 }
-            ]
+            stop: [{ command: `bash ${RUNTIME_ROOT}/hooks/stop-checkpoint.sh`, timeout: 10 }]
         }
     }, null, 2);
 }
@@ -1624,9 +1663,6 @@ export function codexHooksJsonWithObservation() {
                         }, {
                             type: "command",
                             command: `bash ${RUNTIME_ROOT}/hooks/workflow-guard.sh`
-                        }, {
-                            type: "command",
-                            command: `bash ${RUNTIME_ROOT}/hooks/observe.sh pre`
                         }]
                 }],
             PostToolUse: [{
@@ -1634,24 +1670,14 @@ export function codexHooksJsonWithObservation() {
                     hooks: [{
                             type: "command",
                             command: `bash ${RUNTIME_ROOT}/hooks/context-monitor.sh`
-                        }, {
-                            type: "command",
-                            command: `bash ${RUNTIME_ROOT}/hooks/observe.sh post`
                         }]
                 }],
             Stop: [{
-                    hooks: [
-                        {
-                            type: "command",
-                            command: `bash ${RUNTIME_ROOT}/hooks/summarize-observations.sh`,
-                            timeout: 15
-                        },
-                        {
+                    hooks: [{
                             type: "command",
                             command: `bash ${RUNTIME_ROOT}/hooks/stop-checkpoint.sh`,
                             timeout: 10
-                        }
-                    ]
+                        }]
                 }]
         }
     }, null, 2);

package/dist/content/session-hooks.js

@@ -26,7 +26,7 @@ These are prompt-discipline guidelines that complement the real hooks cclaw gene
 When a new session begins in any harness:
 
 1. **Read flow state:** Load \`.cclaw/state/flow-state.json\` to find the current stage and completed stages.
-2. **Load learnings:** Run \`tail -n 20 .cclaw/learnings.jsonl 2>/dev/null\` and surface the top 3 highest-confidence entries (see learnings skill for dedup/decay).
+2. **Load knowledge:** Review recent entries from \`.cclaw/knowledge.md\` and surface the most relevant rules/patterns.
 3. **Check for in-progress work:** If the last stage is incomplete, remind the user and offer to resume.
 4. **Load suggestion memory:** Read \`.cclaw/state/suggestion-memory.json\` and honor \`enabled=false\` opt-out.
 5. **Read AGENTS.md:** The cclaw block contains routing and rules — follow them.
@@ -35,7 +35,7 @@ When a new session begins in any harness:
 
 \`\`\`
 Cclaw flow state: [current stage] ([N] of 9 stages completed)
-Top learnings: [key1] (confidence N), [key2] (confidence N), [key3] (confidence N)
+Knowledge highlights: [rule/pattern 1], [rule/pattern 2], [rule/pattern 3]
 Next action: /cc-[stage] to continue, or describe what you'd like to do.
 \`\`\`
 
@@ -45,7 +45,7 @@ Before ending a session or when context is full:
 
 1. **Verify no pending changes:** All modified files must be either committed or explicitly reverted.
 2. **Update flow state:** Mark the current stage as its actual status (DONE / DONE_WITH_CONCERNS / BLOCKED).
-3. **Write learnings:** If any insight from this session would save 5+ minutes next time, append to \`.cclaw/learnings.jsonl\`.
+3. **Write knowledge:** If any non-obvious reusable insight appears, append to \`.cclaw/knowledge.md\` with type \`rule\`, \`pattern\`, or \`lesson\`.
 4. **Create checkpoint:** Write a brief status note to the current artifact or as a comment in flow-state.json.
 
 ### Stop conditions (agent must halt and report)
@@ -61,7 +61,7 @@ When resuming work after a break:
 
 1. Re-read \`.cclaw/state/flow-state.json\` (may have changed externally).
 2. Re-read the current stage's artifact to verify it matches your last checkpoint.
-3. Re-load top learnings.
+3. Re-load recent knowledge entries.
 4. Continue from the last incomplete step — do not restart the stage.
 
 ## Proactive Suggestion Memory
@@ -121,16 +121,16 @@ When approaching context limits:
 - Ending a session with modified but uncommitted files
 - No flow state update after completing work
 - Restarting a stage from scratch instead of resuming from checkpoint
-- Ignoring learnings from prior sessions
+- Ignoring knowledge from prior sessions
 `;
 }
 export function sessionHooksAgentsMdBlock() {
     return `### Session Guidelines
 
 Session boundary behavior (real hooks inject context automatically; guidelines cover manual steps):
-- **Start:** Hooks inject flow state + top learnings. Check for in-progress work, show status.
-- **Stop:** Hooks remind about checkpoint. Verify no pending changes, update flow state, write learnings.
-- **Resume:** Re-read state, verify artifact, re-load learnings, continue from last step.
+- **Start:** Hooks inject flow state + knowledge snapshot. Check for in-progress work, show status.
+- **Stop:** Hooks remind about checkpoint. Verify no pending changes, update flow state, append useful knowledge.
+- **Resume:** Re-read state, verify artifact, re-load knowledge, continue from last step.
 
 Skill: \`.cclaw/skills/session/SKILL.md\`
 `;

package/dist/content/skills.js

@@ -2,10 +2,6 @@ import { RUNTIME_ROOT } from "../constants.js";
 import { stageExamples } from "./examples.js";
 import { selfImprovementBlock } from "./learnings.js";
 import { QUESTION_FORMAT_SPEC, ERROR_BUDGET_SPEC, stageAutoSubagentDispatch, stageSchema } from "./stage-schema.js";
-function artifactFileName(artifactPath) {
-    const parts = artifactPath.split("/");
-    return parts[parts.length - 1] ?? artifactPath;
-}
 function rationalizationTable(stage) {
     const schema = stageSchema(stage);
     return `| Rationalization | Reality |
@@ -75,20 +71,17 @@ function contextLoadingBlock(stage) {
     const trace = stageSchema(stage).crossStageTrace;
     const readLines = trace.readsFrom.length > 0
         ? trace.readsFrom
-            .map((value) => {
-            const fileName = artifactFileName(value);
-            return `- Canonical: \`.cclaw/runs/<activeRunId>/artifacts/${fileName}\` (fallback: \`${value}\`)`;
-        })
+            .map((value) => `- \`${value}\``)
             .join("\n")
         : "- (first stage — no upstream artifacts)";
     return `## Context Loading
 
 Before starting stage execution:
-1. Read \`.cclaw/state/flow-state.json\` and capture \`activeRunId\`.
-2. Resolve canonical run artifact root: \`.cclaw/runs/<activeRunId>/artifacts/\`.
+1. Read \`.cclaw/state/flow-state.json\`.
+2. Resolve active artifact root: \`.cclaw/artifacts/\`.
 3. Load upstream artifacts required by this stage:
 ${readLines}
-4. If canonical run artifact is missing, fallback to the \`.cclaw/artifacts/\` mirror and record that fallback.
+4. Read \`.cclaw/knowledge.md\` and apply relevant entries before making decisions.
 `;
 }
 function whenNotToUseBlock(stage) {
@@ -113,7 +106,7 @@ function autoSubagentDispatchBlock(stage) {
         .join("\n");
     const mandatory = stageSchema(stage).mandatoryDelegations;
     const mandatoryList = mandatory.length > 0 ? mandatory.map((a) => `\`${a}\``).join(", ") : "(none — only proactive dispatch applies)";
-    const delegationLogRel = `${RUNTIME_ROOT}/runs/<activeRunId>/delegation-log.json`;
+    const delegationLogRel = `${RUNTIME_ROOT}/state/delegation-log.json`;
     return `## Automatic Subagent Dispatch
 
 Machine-only work should be delegated to specialist agents automatically according to the matrix below.
@@ -174,7 +167,7 @@ When all required gates are satisfied and the artifact is written:
 1. **Update \`${RUNTIME_ROOT}/state/flow-state.json\`:**
 ${stateUpdate}
    - For each passed gate, add an entry to \`guardEvidence\`: \`"<gate_id>": "<artifact path or excerpt proving the gate>"\`. Do NOT leave \`guardEvidence\` empty.
-2. **Persist artifact** at \`${RUNTIME_ROOT}/artifacts/${schema.artifactFile}\`. Do NOT manually copy into run directories; cclaw sync/runtime keeps \`${RUNTIME_ROOT}/runs/<activeRunId>/artifacts/\` aligned.
+2. **Persist artifact** at \`${RUNTIME_ROOT}/artifacts/${schema.artifactFile}\`. Do NOT manually copy into \`${RUNTIME_ROOT}/runs/\`; archival is handled by \`cclaw archive\`.
 ${nextAction}
 
 **STOP.** Do not load the next stage skill yourself. The user will run \`/cc-next\` when ready (same session or new session).
@@ -231,7 +224,7 @@ function progressiveDisclosureBlock(stage) {
 - Primary stage procedure (this file): \`.cclaw/skills/${schema.skillFolder}/SKILL.md\`
 - Orchestrator contract (gate language and handoff): \`.cclaw/commands/${stage}.md\`
 - Artifact structure baseline: \`.cclaw/templates/${schema.artifactFile}\`
-- Runtime state truth source: \`.cclaw/state/flow-state.json\` + \`.cclaw/runs/<activeRunId>/\`
+- Runtime state truth source: \`.cclaw/state/flow-state.json\` + \`.cclaw/artifacts/\` + \`.cclaw/knowledge.md\`
 
 ### See also
 - Meta routing and activation rules: \`.cclaw/skills/using-cclaw/SKILL.md\`
@@ -287,7 +280,7 @@ function quickStartBlock(stage) {
 
 > **Even if you read nothing else, do these 3 things:**
 > 1. Obey the HARD-GATE below — violating it invalidates the entire stage.
-> 2. Complete every checklist step in order and write the artifact to \`.cclaw/artifacts/${schema.artifactFile}\`. Run snapshots in \`.cclaw/runs/<activeRunId>/artifacts/\` are synchronized by cclaw runtime.
+> 2. Complete every checklist step in order and write the artifact to \`.cclaw/artifacts/${schema.artifactFile}\`.
 > 3. Do not claim completion without satisfying gates: ${topGates}${schema.requiredGates.length > 3 ? ` (+${schema.requiredGates.length - 3} more)` : ""}.
 >
 > **After this stage:** update \`flow-state.json\` and tell the user to run \`/cc-next\`.
@@ -385,7 +378,7 @@ ${progressiveDisclosureBlock(stage)}
 ${selfImprovementBlock(stage)}
 ## Handoff
 - Next command: \`/cc-next\` (loads whatever stage is current in flow-state)
-- Required artifact: \`.cclaw/artifacts/${schema.artifactFile}\` (run snapshot at \`.cclaw/runs/<activeRunId>/artifacts/${schema.artifactFile}\`, synchronized by cclaw runtime)
+- Required artifact: \`.cclaw/artifacts/${schema.artifactFile}\`
 - Stage stays blocked if any required gate is unsatisfied
 `;
 }