subconscious-cli 6.0.1 → 6.2.0

package/bin/runbook/pi/agent.json

@@ -0,0 +1,217 @@
+{
+  "id": "pi",
+  "command": "pi",
+  "aliases": [],
+  "name": "Pi",
+  "description": "Refresh Pi with the live Subconscious model catalog and launch the active profile model.",
+  "protocol": "openai",
+  "homepage": "https://pi.dev",
+  "install": {
+    "commands": null,
+    "url": "https://pi.dev",
+    "method": null,
+    "package": null,
+    "version": null,
+    "minimum_version": null,
+    "verified": false,
+    "note": "No install command is defined; subc expects pi on PATH."
+  },
+  "runbook": {
+    "mode": "launch",
+    "script": "run.sh",
+    "setup_script": "install.sh",
+    "setup_actions": ["install", "status", "uninstall"],
+    "after_install": "Start a fresh session with subc pi."
+  },
+  "help": {
+    "usage": "subc [-p NAME] pi [help|install|status|uninstall] [Pi arguments...]",
+    "behavior": "Refreshes the persistent Subconscious provider from the live catalog, then launches Pi.",
+    "options": [
+      ["help", "Show this help"],
+      ["install", "Refresh the Subconscious provider without launching Pi"],
+      ["status", "Inspect the persistent Pi provider"],
+      ["uninstall", "Remove only the Subconscious Pi provider and extension"],
+      ["--model MODEL", "Override the profile model for this launch"]
+    ],
+    "args": ["ARGS...", "Pass arguments directly to Pi"]
+  },
+  "sessions": { "key": "pi", "portable": true },
+  "prerequisites": [
+    {
+      "command": "jq",
+      "needed_for": "install and every launch",
+      "required": true
+    }
+  ],
+  "launch": {
+    "argv": [
+      "pi",
+      "--provider",
+      "subconscious",
+      "--model",
+      "{model}",
+      "{args}"
+    ],
+    "headless_argv": [
+      "pi",
+      "--provider",
+      "subconscious",
+      "--model",
+      "{model}",
+      "--print",
+      "{args}"
+    ],
+    "headless_stdin": "{prompt}",
+    "headless_platforms": ["darwin", "linux"],
+    "resume": ["--session", "{sessionFile}"],
+    "handoff": ["{prompt}"],
+    "persistent_setup": true,
+    "note": "Each launch first runs install.sh install, which rewrites the persistent files below."
+  },
+  "inputs": [
+    {
+      "name": "PI_API_KEY",
+      "label": "Pi API key",
+      "description": "Pi-specific credential override; blank uses API_KEY.",
+      "type": "secret"
+    },
+    {
+      "name": "PI_CONTEXT_WINDOW",
+      "default": 5000000,
+      "label": "Context window",
+      "description": "Pi context window used to determine compaction.",
+      "type": "integer",
+      "min": 1
+    },
+    {
+      "name": "PI_MAX_TOKENS",
+      "default": 65536,
+      "label": "Maximum output tokens",
+      "description": "Maximum output tokens advertised to Pi.",
+      "type": "integer",
+      "min": 1
+    }
+  ],
+  "env": [],
+  "config": [
+    {
+      "kind": "file",
+      "path": "~/.pi/agent/models.json",
+      "lifetime": "persistent",
+      "value": {
+        "providers.subconscious.baseUrl": "{baseUrlV1}",
+        "providers.subconscious.api": "openai-completions",
+        "providers.subconscious.apiKey": "{apiKey}",
+        "providers.subconscious.headers": {
+          "x-subconscious-client": "pi"
+        },
+        "providers.subconscious.models[].contextWindow": "${PI_CONTEXT_WINDOW}",
+        "providers.subconscious.models[].maxTokens": "${PI_MAX_TOKENS}",
+        "providers.subconscious.models[].compat": {
+          "sendSessionAffinityHeaders": true,
+          "sessionAffinityFormat": "openai-nosession"
+        }
+      },
+      "description": "Subconscious provider, written by install.sh and merged in; other providers are kept. Mode 600; holds the key in plain text."
+    },
+    {
+      "kind": "file",
+      "path": "~/.pi/agent/subconscious.env",
+      "lifetime": "persistent",
+      "description": "SUBCONSCIOUS_GATEWAY_URL and SUBCONSCIOUS_API_KEY for the compaction extension (mode 600)."
+    },
+    {
+      "kind": "file",
+      "path": "~/.pi/agent/extensions/subconscious-compaction.ts",
+      "lifetime": "persistent",
+      "description": "Compaction reporting extension."
+    },
+    {
+      "kind": "dir",
+      "path": "~/.pi/agent/extensions/subconscious-image-window",
+      "lifetime": "persistent",
+      "description": "Extension that keeps requests to the newest 30 images."
+    }
+  ],
+  "capabilities": {
+    "compaction": {
+      "default": "on",
+      "on": {
+        "set_by_subc": true,
+        "kind": "config-field",
+        "name": "providers.subconscious.models[].contextWindow",
+        "value": "${PI_CONTEXT_WINDOW}",
+        "verified": false,
+        "note": "subc sets contextWindow. That Pi compacts relative to it comes only from the profile setting description.",
+        "config": "~/.pi/agent/models.json"
+      },
+      "off": {
+        "set_by_subc": false,
+        "kind": "config-field",
+        "name": "compaction.enabled",
+        "value": false,
+        "verified": false,
+        "note": "Upstream Pi setting. subc never sets it, and this repo does not confirm its location or behaviour.",
+        "config": "Pi settings (location unverified)"
+      },
+      "threshold": {
+        "set_by_subc": true,
+        "kind": "config-field",
+        "name": "providers.subconscious.models[].contextWindow",
+        "value": "${PI_CONTEXT_WINDOW}",
+        "verified": false,
+        "note": "subc sets contextWindow. That Pi compacts relative to it comes only from the profile setting description. Pi's reserveTokens also moves the trigger; subc never sets it.",
+        "semantics": "window",
+        "config": "~/.pi/agent/models.json"
+      }
+    },
+    "mcp": {
+      "configured_by_subc": false,
+      "transports": null,
+      "verified": false,
+      "note": "subc configures no MCP servers."
+    },
+    "headers": [
+      {
+        "name": "x-subconscious-client",
+        "value": "pi",
+        "on": "model requests",
+        "set_by_subc": true,
+        "verified": true
+      },
+      {
+        "name": "x-session-affinity",
+        "value": "session ID",
+        "on": "model requests",
+        "set_by_subc": true,
+        "verified": false,
+        "note": "Enabled by compat.sendSessionAffinityHeaders; the header name comes from an install.sh comment."
+      },
+      {
+        "name": "Authorization",
+        "value": "Bearer {apiKey}",
+        "on": "extension POSTs to {baseUrl}/v1/agent-hooks",
+        "set_by_subc": true,
+        "verified": true
+      }
+    ],
+    "hooks": [
+      {
+        "event": "session_before_compact",
+        "posts": "conversation_compaction phase=start",
+        "endpoint": "{baseUrl}/v1/agent-hooks",
+        "config": "~/.pi/agent/extensions/subconscious-compaction.ts",
+        "installed_by": ["launch", "install"],
+        "verified": true
+      },
+      {
+        "event": "session_compact",
+        "posts": "conversation_compaction phase=end",
+        "endpoint": "{baseUrl}/v1/agent-hooks",
+        "config": "~/.pi/agent/extensions/subconscious-compaction.ts",
+        "installed_by": ["launch", "install"],
+        "verified": true
+      }
+    ]
+  }
+}

package/bin/runbook/pi/install.sh

@@ -47,26 +47,21 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../model-capabilities.generated.sh"
+source "${SCRIPT_DIR}/../lib.sh"
 EXTENSION_SRC="${SCRIPT_DIR}/subconscious-compaction.ts"
-
-# Load shared env from SUBC_ENV_FILE, or a sibling .env / env.example.
-SHARED_ENV="${SUBC_ENV_FILE:-${SCRIPT_DIR}/../.env}"
-[[ -f "$SHARED_ENV" ]] || SHARED_ENV="${SCRIPT_DIR}/../env.example"
-if [[ -f "$SHARED_ENV" ]]; then set -a; source "$SHARED_ENV"; set +a; fi
+IMAGE_WINDOW_SRC="${SCRIPT_DIR}/../image-window"
 
 COMMAND="install"
 GATEWAY_URL="${GATEWAY_URL:-}"
 API_KEY="${PI_API_KEY:-${API_KEY:-}}"
-MODEL="${MODEL:-subconscious/glm-5.3-marathon}"
-CONTEXT_WINDOW="${PI_CONTEXT_WINDOW:-5000000}"
-MAX_TOKENS="${PI_MAX_TOKENS:-65536}"
+CONTEXT_WINDOW="${PI_CONTEXT_WINDOW:-}"
+MAX_TOKENS="${PI_MAX_TOKENS:-}"
 
 usage() {
   cat <<'EOF'
 Usage:
-  subc pi install [--gateway-url URL] [--api-key KEY] [--model MODEL]
-             [--context-window N] [--max-tokens N]
+  subc pi install [--gateway-url URL] [--api-key KEY] [--context-window N]
+             [--max-tokens N]
   subc pi uninstall
   subc pi status
 
@@ -91,10 +86,6 @@ while [[ $# -gt 0 ]]; do
       API_KEY="${2:-}"
       shift 2
       ;;
-    --model)
-      MODEL="${2:-}"
-      shift 2
-      ;;
     --context-window)
       CONTEXT_WINDOW="${2:-}"
       shift 2
@@ -115,35 +106,8 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-DEFAULT_SUBCONSCIOUS_MODELS="subconscious/glm-5.3-marathon
-subconscious/glm-5.2
-subconscious/tim-qwen3.6-27b
-subconscious/deepseek-v4-flash-marathon
-subconscious/deepseek-v4.1-flash-marathon"
-SUPPORTED_MODELS=()
-
-add_supported_model() {
-  local model_id="$1" existing
-  [[ -n "$model_id" ]] || return 0
-  if [[ ! "$model_id" =~ ^[-A-Za-z0-9._:/+]+$ ]]; then
-    echo "error: invalid model id: $model_id" >&2
-    exit 1
-  fi
-  if [[ "${#SUPPORTED_MODELS[@]}" -gt 0 ]]; then
-    for existing in "${SUPPORTED_MODELS[@]}"; do
-      [[ "$existing" == "$model_id" ]] && return 0
-    done
-  fi
-  SUPPORTED_MODELS+=("$model_id")
-}
-
-add_supported_model "$MODEL"
-while IFS= read -r model_id; do
-  add_supported_model "$model_id"
-done <<< "${SUBCONSCIOUS_MODELS:-$DEFAULT_SUBCONSCIOUS_MODELS}"
-
 MODEL_ENTRIES_JSON=""
-for model_id in "${SUPPORTED_MODELS[@]}"; do
+while IFS= read -r model_id; do
   vision_fields=""
   if subc_model_supports_vision "$model_id"; then
     vision_fields=',"input":["text","image"]'
@@ -154,12 +118,14 @@ for model_id in "${SUPPORTED_MODELS[@]}"; do
   else
     MODEL_ENTRIES_JSON="$model_json"
   fi
-done
+done <<< "${SUBC_MODEL_IDS:-}"
 
 PI_DIR="${PI_CODING_AGENT_DIR:-${HOME}/.pi/agent}"
 MODELS_JSON="${PI_DIR}/models.json"
 EXTENSIONS_DIR="${PI_DIR}/extensions"
 EXTENSION_DST="${EXTENSIONS_DIR}/subconscious-compaction.ts"
+# Keeps requests at the newest 30 images so a long session's upload stops growing.
+IMAGE_WINDOW_DST="${EXTENSIONS_DIR}/subconscious-image-window"
 ENV_FILE="${PI_DIR}/subconscious.env"
 MARKER='x-subconscious-client'
 
@@ -222,6 +188,8 @@ write_extension() {
   fi
   mkdir -p "$EXTENSIONS_DIR"
   cp "$EXTENSION_SRC" "$EXTENSION_DST"
+  rm -rf "$IMAGE_WINDOW_DST"
+  cp -R "$IMAGE_WINDOW_SRC" "$IMAGE_WINDOW_DST"
 }
 
 uninstall_config() {
@@ -235,6 +203,7 @@ uninstall_config() {
     echo "No Pi models.json at $MODELS_JSON"
   fi
   rm -f "$EXTENSION_DST" "$ENV_FILE"
+  rm -rf "$IMAGE_WINDOW_DST"
 }
 
 status() {
@@ -253,6 +222,11 @@ status() {
   else
     echo "compaction extension: not installed"
   fi
+  if [[ -d "$IMAGE_WINDOW_DST" ]]; then
+    echo "image window extension: $IMAGE_WINDOW_DST (installed)"
+  else
+    echo "image window extension: not installed"
+  fi
   if [[ -f "$ENV_FILE" ]]; then
     echo "env: $ENV_FILE (present)"
   else

package/bin/runbook/pi/run.sh

@@ -1,25 +1,13 @@
 #!/usr/bin/env bash
-# Refresh the Subconscious provider from the live catalog, then launch Pi.
-# Other providers in models.json are preserved.
+# Refresh the Subconscious provider from the live catalog, then start the pi
+# argv subc built. Other providers in models.json are preserved.
 
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-GATEWAY_URL="${GATEWAY_URL:-}"
-API_KEY="${PI_API_KEY:-${API_KEY:-}}"
-MODEL="${MODEL:-subconscious/glm-5.3-marathon}"
-PI_DIR="${PI_CODING_AGENT_DIR:-${HOME}/.pi/agent}"
-MODELS_JSON="${PI_DIR}/models.json"
+source "${SCRIPT_DIR}/../lib.sh"
 
-if [[ -z "$GATEWAY_URL" || -z "$API_KEY" ]]; then
-  echo "error: GATEWAY_URL and API_KEY are required to configure Pi" >&2
-  exit 1
-fi
+# stdin can hold a headless prompt, which belongs to Pi.
+"${SCRIPT_DIR}/install.sh" install </dev/null >/dev/null
 
-"${SCRIPT_DIR}/install.sh" install \
-  --gateway-url "$GATEWAY_URL" \
-  --api-key "$API_KEY" \
-  --model "$MODEL" \
-  >/dev/null
-
-exec pi --provider subconscious --model "$MODEL" "$@"
+subc_exec -- "$@"

package/bin/runbook/pi/subconscious-compaction.ts

@@ -51,7 +51,9 @@ function loadSubconsciousEnvFile(): void {
     return;
   }
   try {
-    const path = join(homedir(), '.pi', 'agent', 'subconscious.env');
+    const directory =
+      process.env.PI_CODING_AGENT_DIR || join(homedir(), '.pi', 'agent');
+    const path = join(directory, 'subconscious.env');
     const text = readFileSync(path, 'utf8');
     for (const line of text.split('\n')) {
       const trimmed = line.trim();

package/bin/runbook/shared.json

@@ -0,0 +1,57 @@
+{
+  "agents": [
+    "opencode",
+    "claude-code",
+    "codex",
+    "cursor",
+    "copilot",
+    "pi",
+    "deepseek-harness"
+  ],
+  "defaults": {
+    "model": "subconscious/glm-5.3-marathon",
+    "models": [
+      "subconscious/glm-5.3-marathon",
+      "subconscious/glm-5.2",
+      "subconscious/tim-qwen3.6-27b",
+      "subconscious/deepseek-v4-flash-marathon",
+      "subconscious/deepseek-v4.1-flash-marathon"
+    ],
+    "baseUrl": "https://api.subconscious.dev"
+  },
+  "model_capabilities": {
+    "subconscious/deepseek-v4.1-flash-marathon": { "vision": true }
+  },
+  "inputs": [
+    {
+      "name": "GATEWAY_URL",
+      "group": "shared",
+      "label": "Gateway URL",
+      "description": "Subconscious gateway origin shared by every integration.",
+      "type": "url",
+      "required": true
+    },
+    {
+      "name": "API_KEY",
+      "group": "shared",
+      "label": "Shared API key",
+      "description": "Default credential used when an agent-specific key is blank.",
+      "type": "secret"
+    },
+    {
+      "name": "MODEL",
+      "group": "shared",
+      "label": "Default model",
+      "description": "Initial model used by coding-agent launches and setup. UNSET uses the first live catalog model.",
+      "type": "model"
+    },
+    {
+      "name": "MAX_CONCURRENT_SUBAGENTS",
+      "default": 4,
+      "label": "Concurrent subagents",
+      "description": "Maximum concurrent Claude/Codex subagent threads.",
+      "type": "integer",
+      "min": 1
+    }
+  ]
+}

package/bin/sessions.js

@@ -2,6 +2,7 @@ import { spawnSync } from 'node:child_process';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
+import { AGENTS, agentById, agentCommandName } from './agent-data.js';
 import { resolveAgent, runAgent } from './agents.js';
 
 import { c } from './colors.js';
@@ -14,15 +15,25 @@ const MAX_INDEX_BYTES = 4 * 1024 * 1024;
 const MAX_HANDOFF_MESSAGES = 24;
 const MAX_HANDOFF_CHARS = 24_000;
 const MAX_MESSAGE_CHARS = 4_000;
-const SESSION_KEY_PATTERN = /^(claude|codex|opencode|pi|sc):[-A-Za-z0-9._]+$/;
-
-export const SESSION_HARNESSES = Object.freeze({
-  claude: { name: 'Claude Code', command: 'claude', portable: true },
-  codex: { name: 'Codex CLI', command: 'codex', portable: true },
-  opencode: { name: 'OpenCode', command: 'opencode', portable: true },
-  pi: { name: 'Pi', command: 'pi', portable: true },
-  sc: { name: 'Marathon', command: 'marathon', portable: false },
-});
+const SESSION_KEY_PATTERN = new RegExp(
+  `^(${AGENTS.filter((agent) => agent.sessions)
+    .map((agent) => agent.sessions.key)
+    .join('|')}):[-A-Za-z0-9._]+$`,
+);
+
+export const SESSION_HARNESSES = Object.freeze(
+  Object.fromEntries(
+    AGENTS.filter((agent) => agent.sessions).map((agent) => [
+      agent.sessions.key,
+      Object.freeze({
+        name: agent.name,
+        command: agentCommandName(agent),
+        portable: agent.sessions.portable,
+        agentId: agent.id,
+      }),
+    ]),
+  ),
+);
 
 function cleanText(value) {
   return String(value || '')
@@ -56,7 +67,10 @@ function parseLines(text) {
   for (const line of text.split('\n')) {
     if (!line.trim()) continue;
     try {
-      records.push(JSON.parse(line));
+      const record = JSON.parse(line);
+      if (record && typeof record === 'object' && !Array.isArray(record)) {
+        records.push(record);
+      }
     } catch {
       // Session writers can leave a partial final line after an interrupted run.
     }
@@ -217,14 +231,6 @@ function piMessages(records) {
   });
 }
 
-function scMessages(records) {
-  return records.flatMap((record) => {
-    if (!['user', 'assistant'].includes(record.type)) return [];
-    const text = cleanText(record.text ?? record.content);
-    return text ? [{ role: record.type, text }] : [];
-  });
-}
-
 async function parseFileSession(entry, harness) {
   const records = parseLines(await readBounded(entry.file, MAX_METADATA_BYTES));
   if (!records.length) return null;
@@ -290,19 +296,6 @@ async function parseFileSession(entry, harness) {
     });
   }
 
-  if (harness === 'sc') {
-    const meta = records[0] || {};
-    const messages = scMessages(records);
-    const id = String(meta.id || filename).replace(/^session-/, '');
-    return sessionRecord(harness, id, {
-      title: messages.find((message) => message.role === 'user')?.text,
-      cwd: meta.cwd,
-      model: meta.model,
-      updated: entry.updated,
-      sourcePath: entry.file,
-    });
-  }
-
   return null;
 }
 
@@ -466,7 +459,6 @@ export async function discoverSessions(options = {}) {
     claude: path.join(home, '.claude', 'projects'),
     codex: path.join(home, '.codex', 'sessions'),
     pi: path.join(home, '.pi', 'agent', 'sessions'),
-    sc: path.join(home, '.sc', 'sessions'),
   };
   const indexes =
     options.indexes ||
@@ -486,7 +478,6 @@ export async function discoverSessions(options = {}) {
     codex || discoverFileSessions(roots.codex, 'codex', max),
     Promise.resolve(discoverOpenCodeSessions(execute, max)),
     discoverFileSessions(roots.pi, 'pi', max),
-    discoverFileSessions(roots.sc, 'sc', max),
   ]);
   const seen = new Set();
   return groups
@@ -541,7 +532,6 @@ export async function readSessionMessages(session, options = {}) {
   if (session.harness === 'claude') return claudeMessages(records);
   if (session.harness === 'codex') return codexMessages(records);
   if (session.harness === 'pi') return piMessages(records);
-  if (session.harness === 'sc') return scMessages(records);
   return [];
 }
 
@@ -594,22 +584,38 @@ export function buildHandoffPrompt(session, messages) {
     .join('\n\n');
 }
 
+function sessionLaunch(harness) {
+  return agentById(SESSION_HARNESSES[harness]?.agentId)?.launch ?? {};
+}
+
+// One pass, so a prompt that mentions a placeholder is passed unchanged.
+function fillWords(words, values) {
+  return words.map((word) =>
+    word.replace(/\{(sessionId|sessionFile|prompt)\}/g, (_, name) =>
+      String(values[name]),
+    ),
+  );
+}
+
 export function nativeResumeArgs(session) {
-  if (session.harness === 'claude') return ['--resume', session.id];
-  if (session.harness === 'codex') return ['resume', session.id];
-  if (session.harness === 'opencode') return ['--session', session.id];
-  if (session.harness === 'pi')
-    return ['--session', session.sourcePath || session.id];
-  if (session.harness === 'sc') return ['--resume', session.sourcePath];
-  throw new Error(`Native resume is not supported for ${session.harnessName}.`);
+  const { resume } = sessionLaunch(session.harness);
+  if (!resume)
+    throw new Error(
+      `Native resume is not supported for ${session.harnessName}.`,
+    );
+  return fillWords(resume, {
+    sessionId: session.id,
+    sessionFile: session.sourcePath || session.id,
+  });
 }
 
 export function handoffLaunchArgs(targetHarness, prompt) {
-  if (targetHarness === 'opencode') return ['--prompt', prompt];
-  if (['claude', 'codex', 'pi'].includes(targetHarness)) return [prompt];
-  throw new Error(
-    `${SESSION_HARNESSES[targetHarness]?.name || targetHarness} cannot start an interactive handoff yet.`,
-  );
+  const { handoff } = sessionLaunch(targetHarness);
+  if (!handoff)
+    throw new Error(
+      `${SESSION_HARNESSES[targetHarness]?.name || targetHarness} cannot start an interactive handoff yet.`,
+    );
+  return fillWords(handoff, { prompt });
 }
 
 function sessionByKey(sessions, key) {
@@ -665,8 +671,7 @@ export async function sessionsCommand(argv, options = {}) {
   const harnessIndex = argv.indexOf('--harness');
   const requestedHarness =
     harnessIndex >= 0 ? argv[harnessIndex + 1] : session.harness;
-  const targetHarness =
-    requestedHarness === 'marathon' ? 'sc' : requestedHarness;
+  const targetHarness = requestedHarness;
   const target = SESSION_HARNESSES[targetHarness];
   if (!target) throw new Error(`Unknown destination harness: ${targetHarness}`);
 

package/bin/tui.js

@@ -422,6 +422,19 @@ function spawnAndWait(command, args, options = {}) {
 }
 
 export async function runTui(options = {}) {
+  for (;;) {
+    const result = await runTuiOnce(options);
+    if (result?.args?.length !== 2 || result.args[0] !== '-p') return result;
+    options = {
+      ...options,
+      profileName: result.args[1],
+      profile: undefined,
+      state: undefined,
+    };
+  }
+}
+
+async function runTuiOnce(options) {
   const executable = await resolveTuiExecutable(options);
   if (!executable) return null;