subconscious-cli 0.3.0 → 4.0.0

package/bin/runbook/claude-code/install.sh

@@ -50,8 +50,8 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Load shared env from coding-agents/.env (gitignored) or env.example.
-SHARED_ENV="${MBTA_ENV_FILE:-${SCRIPT_DIR}/../.env}"
+# 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
 
@@ -87,38 +87,18 @@ COMMAND="install"
 usage() {
   cat <<'EOF'
 Usage:
-  install.sh [install] --gateway-url URL --api-key KEY [--model MODEL] [--compact-window N]
-  install.sh use [-- CLAUDE_ARGS...]
-  install.sh env
-  install.sh unset
-  install.sh uninstall
-  install.sh status
+  subc claude status
+  subc claude uninstall
+  subc claude help
 
-`install` is the default subcommand and may be omitted.
-
-Commands:
-  install     Write ~/.claude/subconscious-gateway.env with gateway settings
-  use         Source the env file and exec claude (pass -- followed by claude args)
-  env         Print export lines for sourcing: source <(./install.sh env)
-  unset       Print unset lines for sourcing: source <(./install.sh unset)
-  uninstall   Remove the env file
-  status      Show current configuration
-
-Options:
-  --gateway-url URL     Gateway origin (e.g. https://gateway.example)
-  --api-key KEY         Gateway API key (sk-gw-...)
-  --model MODEL         Model name (default: subconscious/glm-5.2)
-  --compact-window N    CLAUDE_CODE_AUTO_COMPACT_WINDOW (default: 1000000; Claude Code clamps to 100000–1000000)
-                        See https://code.claude.com/docs/en/env-vars and
-                        https://code.claude.com/docs/en/context-window#set-the-auto-compact-window
-  --max-context-tokens N CLAUDE_CODE_MAX_CONTEXT_TOKENS (default: 3000000)
-                        See https://code.claude.com/docs/en/env-vars
+Claude Code is launch-only: subc claude. Uninstall removes leftover
+~/.claude/subconscious-gateway.env from older persistent setup.
 EOF
 }
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
-    install|use|env|unset|uninstall|status)
+    install|use|env|unset|uninstall|status|help)
       COMMAND="$1"
       shift
       ;;
@@ -169,7 +149,7 @@ write_env() {
   mkdir -p "$CLAUDE_DIR"
   umask 077
   cat >"$ENV_FILE" <<EOF
-# Generated by ol-runbook/coding-agents/claude-code/install.sh — do not commit secrets.
+# Generated by subc — do not commit secrets.
 export ANTHROPIC_BASE_URL="${effective_gateway_url}"
 export ANTHROPIC_AUTH_TOKEN="${API_KEY}"
 export ANTHROPIC_MODEL="${MODEL}"
@@ -205,7 +185,7 @@ EOF
 print_env_exports() {
   if [[ ! -f "$ENV_FILE" ]]; then
     echo "env file not found: $ENV_FILE" >&2
-    echo "run: ./install.sh --gateway-url URL --api-key KEY" >&2
+    echo "Launch Claude with: subc claude" >&2
     return 1
   fi
   cat "$ENV_FILE"
@@ -263,7 +243,7 @@ status() {
     echo "max context tokens: ${CLAUDE_CODE_MAX_CONTEXT_TOKENS:-unset}"
   else
     echo "env file: missing"
-    echo "run: ./install.sh --gateway-url URL --api-key KEY"
+    echo "Launch Claude with: subc claude"
   fi
 }
 
@@ -274,21 +254,13 @@ case "$COMMAND" in
       exit 1
     fi
     write_env
-    echo "Wrote $ENV_FILE"
-    echo "  gateway: $GATEWAY_URL"
-    echo "  model:   $MODEL"
-    echo ""
-    echo "Launch claude:"
-    echo "  ./install.sh use"
-    echo "  ./install.sh use -- --continue"
-    echo ""
-    echo "Or source env into your current shell:"
-    echo "  source <(./install.sh env)"
+    echo "Wrote leftover env file $ENV_FILE"
+    echo "Launch Claude with: subc claude"
     ;;
   use)
     if [[ ! -f "$ENV_FILE" ]]; then
-      echo "env file not found: $ENV_FILE" >&2
-      echo "run: ./install.sh --gateway-url URL --api-key KEY" >&2
+    echo "env file not found: $ENV_FILE" >&2
+    echo "Launch Claude with: subc claude" >&2
       exit 1
     fi
     # shellcheck disable=SC1090
@@ -308,9 +280,11 @@ case "$COMMAND" in
   uninstall)
     rm -f "$ENV_FILE"
     echo "Removed $ENV_FILE"
-    echo "To unset env in your current shell: source <(./install.sh unset)"
     ;;
   status)
     status
     ;;
+  help)
+    usage
+    ;;
 esac

package/bin/runbook/claude-code/run.sh

@@ -11,7 +11,7 @@
 #   ./run.sh --model subconscious/glm-5.2 -p "hi"
 #
 # Config: copy ../env.example to ../.env and edit. .env is gitignored.
-# All agents share one coding-agents/.env file.
+# Profile env is injected by subc. A sibling .env is only used when SUBC_ENV_FILE is unset.
 #
 # Or source it to just export the env:
 #   source run.sh
@@ -20,8 +20,8 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Load shared env from coding-agents/.env (gitignored) or env.example.
-SHARED_ENV="${MBTA_ENV_FILE:-${SCRIPT_DIR}/../.env}"
+# 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
 
@@ -57,7 +57,7 @@ Usage:
   run.sh [options] [-- CLAUDE_ARGS...]
   run.sh [options] CLAUDE_ARGS...
 
-Options (same as install.sh; override coding-agents/.env for this run):
+Options (same as install.sh; flags override env for this run):
   --gateway-url URL      Gateway origin (e.g. https://gateway.example)
   --api-key KEY          Gateway API key (sk-gw-...)
   --model MODEL          Model name (default: subconscious/glm-5.2)
@@ -125,18 +125,18 @@ EFFECTIVE_GATEWAY_URL="${CLAUDE_GATEWAY_URL:-$GATEWAY_URL}"
 
 export ANTHROPIC_BASE_URL="$EFFECTIVE_GATEWAY_URL"
 export ANTHROPIC_AUTH_TOKEN="$API_KEY"
-export ANTHROPIC_MODEL="$MODEL"
-export ANTHROPIC_SMALL_FAST_MODEL="$MODEL"
-export ANTHROPIC_DEFAULT_OPUS_MODEL="$OPUS_MODEL"
-export ANTHROPIC_DEFAULT_OPUS_MODEL_NAME="$OPUS_MODEL_NAME"
-export ANTHROPIC_DEFAULT_OPUS_MODEL_DESCRIPTION="$OPUS_MODEL_DESCRIPTION"
-export ANTHROPIC_DEFAULT_SONNET_MODEL="$SONNET_MODEL"
-export ANTHROPIC_DEFAULT_SONNET_MODEL_NAME="$SONNET_MODEL_NAME"
-export ANTHROPIC_DEFAULT_SONNET_MODEL_DESCRIPTION="$SONNET_MODEL_DESCRIPTION"
-export ANTHROPIC_DEFAULT_HAIKU_MODEL="$HAIKU_MODEL"
-export ANTHROPIC_DEFAULT_HAIKU_MODEL_NAME="$HAIKU_MODEL_NAME"
-export ANTHROPIC_DEFAULT_HAIKU_MODEL_DESCRIPTION="$HAIKU_MODEL_DESCRIPTION"
-export CLAUDE_CODE_SUBAGENT_MODEL="$MODEL"
+export ANTHROPIC_MODEL="${ANTHROPIC_MODEL:-$MODEL}"
+export ANTHROPIC_SMALL_FAST_MODEL="${ANTHROPIC_SMALL_FAST_MODEL:-$MODEL}"
+export ANTHROPIC_DEFAULT_OPUS_MODEL="${ANTHROPIC_DEFAULT_OPUS_MODEL:-$OPUS_MODEL}"
+export ANTHROPIC_DEFAULT_OPUS_MODEL_NAME="${ANTHROPIC_DEFAULT_OPUS_MODEL_NAME:-$OPUS_MODEL_NAME}"
+export ANTHROPIC_DEFAULT_OPUS_MODEL_DESCRIPTION="${ANTHROPIC_DEFAULT_OPUS_MODEL_DESCRIPTION:-$OPUS_MODEL_DESCRIPTION}"
+export ANTHROPIC_DEFAULT_SONNET_MODEL="${ANTHROPIC_DEFAULT_SONNET_MODEL:-$SONNET_MODEL}"
+export ANTHROPIC_DEFAULT_SONNET_MODEL_NAME="${ANTHROPIC_DEFAULT_SONNET_MODEL_NAME:-$SONNET_MODEL_NAME}"
+export ANTHROPIC_DEFAULT_SONNET_MODEL_DESCRIPTION="${ANTHROPIC_DEFAULT_SONNET_MODEL_DESCRIPTION:-$SONNET_MODEL_DESCRIPTION}"
+export ANTHROPIC_DEFAULT_HAIKU_MODEL="${ANTHROPIC_DEFAULT_HAIKU_MODEL:-$HAIKU_MODEL}"
+export ANTHROPIC_DEFAULT_HAIKU_MODEL_NAME="${ANTHROPIC_DEFAULT_HAIKU_MODEL_NAME:-$HAIKU_MODEL_NAME}"
+export ANTHROPIC_DEFAULT_HAIKU_MODEL_DESCRIPTION="${ANTHROPIC_DEFAULT_HAIKU_MODEL_DESCRIPTION:-$HAIKU_MODEL_DESCRIPTION}"
+export CLAUDE_CODE_SUBAGENT_MODEL="${CLAUDE_CODE_SUBAGENT_MODEL:-$MODEL}"
 export CLAUDE_CODE_MAX_CONCURRENT_SUBAGENTS="${MAX_CONCURRENT_SUBAGENTS}"
 export CLAUDE_CODE_MAX_SUBAGENT_SPAWN_DEPTH="${MAX_SUBAGENT_SPAWN_DEPTH}"
 export CLAUDE_CODE_AUTO_COMPACT_WINDOW="${COMPACT_WINDOW}"
@@ -145,13 +145,13 @@ export CLAUDE_CODE_MAX_CONTEXT_TOKENS="${MAX_CONTEXT_TOKENS}"
 # (not a general logs API). Docs:
 # https://code.claude.com/docs/en/monitoring-usage#api-request-event
 # Requires Claude Code >= 2.1.152.
-export CLAUDE_CODE_ENABLE_TELEMETRY=1
-export CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1
-export OTEL_LOGS_EXPORTER=otlp
-export OTEL_EXPORTER_OTLP_PROTOCOL=http/json
+export CLAUDE_CODE_ENABLE_TELEMETRY="${CLAUDE_CODE_ENABLE_TELEMETRY:-1}"
+export CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC="${CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC:-1}"
+export OTEL_LOGS_EXPORTER="${OTEL_LOGS_EXPORTER:-otlp}"
+export OTEL_EXPORTER_OTLP_PROTOCOL="${OTEL_EXPORTER_OTLP_PROTOCOL:-http/json}"
 export OTEL_EXPORTER_OTLP_LOGS_ENDPOINT="${EFFECTIVE_GATEWAY_URL%/}/v1/logs"
 export OTEL_EXPORTER_OTLP_HEADERS="x-api-key=${API_KEY}"
-export OTEL_EXPORTER_OTLP_TIMEOUT=2000
+export OTEL_EXPORTER_OTLP_TIMEOUT="${OTEL_EXPORTER_OTLP_TIMEOUT:-2000}"
 export OTEL_LOGS_EXPORT_INTERVAL="${OTEL_LOGS_EXPORT_INTERVAL:-2000}"
 # Do not set OTEL_TRACES_EXPORTER / OTEL_METRICS_EXPORTER (including to "none") -
 # Claude's telemetry init can abort the whole pipeline on unknown exporter types.

package/bin/runbook/codex/hook.sh

@@ -22,7 +22,7 @@ if [[ -f "$CONFIG" ]]; then
   # shellcheck disable=SC1090
   source "$CONFIG"
 fi
-# install.sh also writes subconscious.env with the API key for the CLI.
+# Older overwrite-style setup also wrote subconscious.env; keep reading it.
 if [[ -f "${HOME}/.codex/subconscious.env" ]]; then
   # shellcheck disable=SC1090
   source "${HOME}/.codex/subconscious.env"

package/bin/runbook/codex/hooks-lib.sh

@@ -0,0 +1,139 @@
+#!/usr/bin/env bash
+# Surgical Codex hook merge/unmerge. Sourced by install.sh and run.sh.
+# Never reads, writes, or deletes ~/.codex/config.toml.
+
+CODEX_DIR="${CODEX_DIR:-${HOME}/.codex}"
+HOOKS_JSON="${HOOKS_JSON:-${CODEX_DIR}/hooks.json}"
+HOOK_DST="${HOOK_DST:-${CODEX_DIR}/subconscious-hook.sh}"
+HOOKS_ENV_FILE="${HOOKS_ENV_FILE:-${CODEX_DIR}/subconscious-hooks.env}"
+MARKER="${MARKER:-subconscious-hook.sh}"
+
+codex_hooks_have_jq() {
+  command -v jq >/dev/null 2>&1
+}
+
+codex_hooks_json_valid() {
+  [[ -f "$HOOKS_JSON" ]] && jq -e . "$HOOKS_JSON" >/dev/null 2>&1
+}
+
+codex_strip_hook_entries() {
+  local tmp
+  tmp="$(mktemp)"
+  jq --arg marker "$MARKER" '
+    def strip:
+      (. // [])
+      | map(
+          .hooks = ((.hooks // []) | map(select((.command // "") | tostring | contains($marker) | not)))
+        )
+      | map(select((.hooks | length) > 0));
+    .hooks = (.hooks // {})
+    | .hooks |= with_entries(.value |= strip)
+  ' "$HOOKS_JSON" >"$tmp"
+  mv "$tmp" "$HOOKS_JSON"
+}
+
+codex_append_hook_groups() {
+  local tmp
+  tmp="$(mktemp)"
+  jq --arg cmd "$HOOK_DST" '
+    def group($msg):
+      [{ "hooks": [{ "type": "command", "command": $cmd, "timeout": 3, "statusMessage": $msg }] }];
+    .hooks = (.hooks // {})
+    | .hooks.PreCompact = ((.hooks.PreCompact // []) + group("Reporting compaction start"))
+    | .hooks.PostCompact = ((.hooks.PostCompact // []) + group("Reporting compaction end"))
+  ' "$HOOKS_JSON" >"$tmp"
+  mv "$tmp" "$HOOKS_JSON"
+}
+
+codex_write_hook_script() {
+  mkdir -p "$CODEX_DIR"
+  cp "$HOOK_SRC" "$HOOK_DST"
+  chmod +x "$HOOK_DST"
+}
+
+codex_write_hooks_env() {
+  umask 077
+  cat >"$HOOKS_ENV_FILE" <<EOF
+# Generated by subconscious-cli Codex integration — do not commit secrets.
+export SUBCONSCIOUS_GATEWAY_URL='${GATEWAY_URL%/}'
+export SUBCONSCIOUS_API_KEY='${API_KEY}'
+EOF
+  chmod 600 "$HOOKS_ENV_FILE"
+}
+
+# codex_ensure_hooks [strict|best-effort]
+codex_ensure_hooks() {
+  local mode="${1:-strict}"
+  if ! codex_hooks_have_jq; then
+    echo "warning: jq is required to merge Codex hooks without overwriting ~/.codex/hooks.json" >&2
+    if [[ "$mode" == "strict" ]]; then
+      echo "missing required command: jq" >&2
+      return 1
+    fi
+    return 0
+  fi
+  if [[ -z "${GATEWAY_URL:-}" || -z "${API_KEY:-}" ]]; then
+    echo "--gateway-url and --api-key are required to install Codex hooks" >&2
+    return 1
+  fi
+  if [[ -z "${HOOK_SRC:-}" || ! -f "$HOOK_SRC" ]]; then
+    echo "warning: Codex hook script missing; skipping hooks" >&2
+    return 0
+  fi
+  mkdir -p "$CODEX_DIR"
+  if [[ -f "$HOOKS_JSON" ]] && ! codex_hooks_json_valid; then
+    echo "warning: ${HOOKS_JSON} is not valid JSON; leaving it unchanged" >&2
+    if [[ "$mode" == "strict" ]]; then
+      return 1
+    fi
+    return 0
+  fi
+  if [[ ! -f "$HOOKS_JSON" ]]; then
+    printf '%s\n' '{"hooks":{}}' >"$HOOKS_JSON"
+  fi
+  codex_write_hook_script
+  codex_write_hooks_env
+  codex_strip_hook_entries
+  codex_append_hook_groups
+  echo "Merged Subconscious Codex hooks into $HOOKS_JSON"
+  echo "Trust new hooks in Codex with /hooks (or --dangerously-bypass-hook-trust)."
+}
+
+codex_uninstall_hooks() {
+  if [[ -f "$HOOKS_JSON" ]] && codex_hooks_have_jq && codex_hooks_json_valid; then
+    codex_strip_hook_entries
+    echo "Removed Subconscious entries from $HOOKS_JSON"
+  elif [[ -f "$HOOKS_JSON" ]]; then
+    echo "warning: ${HOOKS_JSON} is not valid JSON; leaving it unchanged" >&2
+  else
+    echo "No Codex hooks.json at $HOOKS_JSON"
+  fi
+  rm -f "$HOOK_DST" "$HOOKS_ENV_FILE"
+  rm -f "${CODEX_DIR}/subconscious.env"
+}
+
+codex_hooks_status() {
+  echo "scope: user"
+  echo "codex dir: $CODEX_DIR"
+  echo "hooks.json: $HOOKS_JSON"
+  if [[ -f "$HOOKS_JSON" ]] && codex_hooks_have_jq && jq -e --arg m "$MARKER" '
+      [.hooks[]?[]?.hooks[]? | select((.command // "") | tostring | contains($m))] | length > 0
+    ' "$HOOKS_JSON" >/dev/null 2>&1; then
+    echo "hooks: installed"
+  else
+    echo "hooks: not installed"
+  fi
+  if [[ -x "$HOOK_DST" ]]; then
+    echo "hook script: $HOOK_DST (executable)"
+  else
+    echo "hook script: missing"
+  fi
+  if [[ -f "$HOOKS_ENV_FILE" ]]; then
+    echo "env: $HOOKS_ENV_FILE (present)"
+  else
+    echo "env: missing"
+  fi
+  if [[ -f "${CODEX_DIR}/config.toml" ]] && grep -q 'model_provider = "subconscious"' "${CODEX_DIR}/config.toml" 2>/dev/null; then
+    echo "legacy config.toml: contains a Subconscious provider (this CLI no longer manages that file)"
+  fi
+}