@cspeach/cli 1.1.14 → 1.1.16

package/README.md

@@ -128,6 +128,69 @@ If `cspeach doctor` fails:
 
 If the REPL hangs on first prompt, check `https://api.cspeach.dev/health`.
 
+## Working on team projects (contributors only)
+
+`cspeach team …` and the `/team/` page are built on two sibling packages in this
+repo:
+
+- `register-core/` — the merge: records in, one picture out
+- `sap-client/` — the SAP calls, including `atcRunSet`
+
+The CLI depends on them as **`file:` links**, and pnpm **copies their `dist/`**
+into `node_modules` at install time. Neither `dist/` is in git. So a fresh
+checkout, or any checkout where somebody changed one of them and did not
+rebuild, runs the CLI against whatever was copied last — usually a
+`TypeError: … is not a function` in the middle of a `cspeach team refresh`.
+
+`src/register/__tests__/linked-packages.test.ts` is the tripwire. When it fails
+with *"The linked packages are out of date"*, run the recipe below.
+
+### The recipe
+
+Git Bash:
+
+```bash
+cd sap-client     && npm run build
+cd ../register-core && ../cspeach-cli/node_modules/.bin/tsc
+cd ../cspeach-cli && pnpm install
+```
+
+Windows (PowerShell or cmd):
+
+```text
+cd sap-client
+npm run build
+cd ..\register-core
+..\cspeach-cli\node_modules\.bin\tsc.CMD
+cd ..\cspeach-cli
+pnpm install
+```
+
+Then check the link really took:
+
+```bash
+grep -c ruleIdFromAtc cspeach-cli/node_modules/@cspeach/register-core/dist/rules.js   # ≥ 1
+grep -c atcRunSet     cspeach-cli/node_modules/@cspeach/sap-client/dist/adt-client.js # ≥ 1
+```
+
+If either prints `0`, run `pnpm install --force` in `cspeach-cli/`.
+
+Notes:
+
+- **`npm run build` does not work in `register-core/`** in this checkout — its
+  devDependencies are not installed. Build it with the CLI's own compiler, as
+  above. `sap-client/` builds normally.
+- **`dist/index.js` is only a re-export barrel**, so grep a real module
+  (`dist/rules.js`, `dist/register.js`) when you check a new name landed.
+- **`pnpm install` rewrites one path separator in `cspeach-cli/pnpm-lock.yaml`.**
+  That is noise. Restore it before you commit:
+  `git checkout -- cspeach-cli/pnpm-lock.yaml`.
+- The **viewer** reads `register-core` from SOURCE (a Vite alias) and needs none
+  of this.
+- Both packages are **unpublished**. `prepublishOnly` blocks `npm publish` of
+  the CLI while either dependency is still a `file:` link; they have to be
+  published and the versions pinned before a CLI release.
+
 ## Links
 
 - **Landing**: https://cspeach.dev

package/dist/agent/loop.js

@@ -30,6 +30,8 @@ import { parseFromFlag, coerceDocFromFlagToAttachment } from '../skills/promotio
 import { input } from '@inquirer/prompts';
 import { withInquirer } from '../repl/inquirer-guard.js';
 import { expandTextFileAttachments } from '../projects/workspace.js';
+import { expandImageAttachments, buildUserContent, trimHistoryImages } from '../projects/image-attachments.js';
+import { expandImageChips } from '../ui/clipboard-image.js';
 import { getSapSystemInfo, renderSapSystemBlock } from '../sap/system-info.js';
 import { renderStandaloneContextBlock } from '../sap/standalone-profile.js';
 import { renderStandardsBlock } from '../standards/standards-file.js';
@@ -45,6 +47,7 @@ import { buildSapConnectionContext } from './sap-connection-adapter.js';
 import { getCurrentTransport } from '../repl/current-transport.js';
 import { collectTurnAssistantText } from './turn-assistant-text.js';
 import { checkAndMark, newGuardState } from './parallel-write-guard.js';
+import { userPromptText } from '../session/user-prompt.js';
 /**
  * Author identity for project-file metadata. Reads CSPEACH_AUTHOR_NAME first,
  * then platform USER/USERNAME, then a generic fallback. Role is fixed to
@@ -103,17 +106,15 @@ const SAVE_HOOK_SKILLS = new Set([
  *    per-process counter would re-inject; the content scan correctly
  *    short-circuits.
  *
- *  - tool_result entries push `role: 'user'` with array-shaped content.
- *    The `typeof === 'string'` check skips those without iterating
- *    multimodal blocks.
+ *  - tool_result entries push `role: 'user'` with array-shaped content;
+ *    userPromptText skips those. An image-attachment prompt is also an
+ *    array ([image…, text]) and IS checked (2026-09-23).
  *
  * Exported for unit testing only — the call site is one floor up in runTurn.
  */
 export function hasProjectContextBlock(messages) {
     for (const m of messages) {
-        if (m.role !== 'user')
-            continue;
-        if (typeof m.content === 'string' && m.content.includes('<project_context')) {
+        if (userPromptText(m)?.includes('<project_context')) {
             return true;
         }
     }
@@ -332,6 +333,20 @@ export async function runTurn(params) {
             userMessageForSave = rest;
         }
     }
+    // Tier 1 screenshots (2026-09-23) — image paths in the prompt (typed,
+    // @-referenced or dragged in) become image content blocks and the path
+    // becomes `[attached <name>]`. Runs BEFORE the text-file expansion so a
+    // path written inside an attached document is never pulled in. Too large
+    // or too many images → the turn is not sent (same early exit as --from).
+    // Pasted clipboard images arrive as [Image #N] chips — swap each for its
+    // saved file path first, so the step below attaches it like a typed path.
+    const imageExpansion = await expandImageAttachments(expandImageChips(userMessageForLLM), params.ctx.cwd, (line) => emit(chalk.dim(line)));
+    if (imageExpansion.error) {
+        emit(chalk.yellow(`
+${imageExpansion.error}`));
+        return;
+    }
+    userMessageForLLM = imageExpansion.text;
     // Phase D — `@<text-file>` attachment expansion.
     // After --from has consumed its own @<token>, scan what's left for
     // `@<filename>` references that resolve to .txt / .md files in the
@@ -416,7 +431,17 @@ export async function runTurn(params) {
     const finalUserContent = projectContextBlock
         ? `${projectContextBlock}\n\n${enriched}`
         : enriched;
-    session.messages.push({ role: 'user', content: finalUserContent });
+    // Images (if any) ride as blocks ahead of the text; with none this is the
+    // same plain string as before.
+    session.messages.push({ role: 'user', content: buildUserContent(finalUserContent, imageExpansion.images) });
+    if (imageExpansion.images.length > 0 && params.provider.name === 'local-openai-compat') {
+        // The local (OpenAI-compatible) provider keeps text blocks only.
+        emit(chalk.dim('(local model: the image is not sent — the model gets the text only)'));
+    }
+    const droppedImages = trimHistoryImages(session.messages);
+    if (droppedImages > 0) {
+        emit(chalk.dim(`(${droppedImages} older image(s) removed from the conversation to keep it under the size limit)`));
+    }
     session.skill = params.skill;
     /**
      * key: `${tool_name}:${object}` — consecutive failures per (tool, target).

package/dist/agent/tool-dispatch.js

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import { getTool, isStandalone } from '../tools/index.js';
 import { NOT_CONNECTED_MESSAGE } from '../sap/offline-adt-client.js';
 import { presentSafetyConfirmation } from '../repl/safety-confirm.js';
@@ -30,7 +31,7 @@ export async function dispatchTool(name, args, ctx) {
     // GUIDE.md) — local scratch, not SAP objects. Rule 8 protects SAP batches;
     // applying it here made the 2nd+ file (GUIDE.md) hit the batch card and,
     // headless, get refused. Exempt from the gate AND from the batch count.
-    const scratchWrite = isScratchOutputWrite(tool, args);
+    const scratchWrite = isScratchOutputWrite(tool, args, ctx.cwd);
     if (tool.isMutating && !scratchWrite && shouldGateRule8()) {
         const r = await presentSafetyConfirmation({
             rule: 'RULE_8_BATCH_PLAN',
@@ -83,21 +84,24 @@ export async function dispatchTool(name, args, ctx) {
     }
 }
 /**
- * True for a mutating filesystem tool whose target sits under ./cspeach-out/
- * (relative to cwd). Accepts `cspeach-out/…`, `./cspeach-out/…` and the
- * Windows backslash form; rejects anything that climbs out (`..`) or is
- * absolute. Deliberately narrow: only this one folder is exempt.
+ * True for a mutating filesystem tool whose target sits under the project's
+ * own ./cspeach-out/ (cwd). Accepts `cspeach-out/…`, `./cspeach-out/…`, the
+ * Windows backslash form, and an ABSOLUTE path that resolves inside
+ * <cwd>/cspeach-out (2026-09-23: models write full paths, and a project deep
+ * in a synced folder hit the batch card on every file after the first).
+ * Rejects anything with a `..` segment and any cspeach-out outside cwd.
+ * Deliberately narrow: only this one folder is exempt.
  */
-export function isScratchOutputWrite(tool, args) {
+export function isScratchOutputWrite(tool, args, cwd = process.cwd()) {
     if (!tool.isMutating || tool.category !== 'filesystem')
         return false;
     const raw = args?.path;
     if (typeof raw !== 'string' || raw.length === 0)
         return false;
     const p = raw.replace(/\\/g, '/').replace(/^\.\//, '');
-    if (p.startsWith('/') || /^[A-Za-z]:\//.test(p))
-        return false;
     if (p.split('/').some((seg) => seg === '..'))
         return false;
-    return p === 'cspeach-out' || p.startsWith('cspeach-out/');
+    const scratchRoot = path.resolve(cwd, 'cspeach-out');
+    const rel = path.relative(scratchRoot, path.resolve(cwd, p));
+    return rel === '' || (!rel.startsWith('..') && !path.isAbsolute(rel));
 }

package/dist/cli.js

@@ -4,6 +4,11 @@ import { runAddSapWizard } from './sap/onboarding.js';
 import { runGcOnStartup } from './session/gc.js';
 import { checkForUpgrade } from './upgrade-check.js';
 import { extractSapAliasFlag, extractNoSapFlag } from './cli-args.js';
+/**
+ * The verbs that make `cspeach project …` a mistyped team command rather than
+ * a prompt somebody meant to send. See the check in `main`.
+ */
+const TEAM_SUBCOMMANDS = new Set(['init', 'join', 'lane', 'refresh', 'status', 'outbox', 'rule', 'leave']);
 export async function main(argv) {
     runGcOnStartup().catch(() => { });
     checkForUpgrade().catch(() => { });
@@ -144,6 +149,47 @@ export async function main(argv) {
         const cfg = await loadConfig();
         return runWhoamiCommand({ proxyUrl: cfg.proxy_url, print: (s) => console.log(s) });
     }
+    // A team project — many laptops, one picture (spec 2026-09-18).
+    if (args[0] === 'team') {
+        const { runTeamCommand } = await import('./commands/team.js');
+        const { getAuthorIdentity } = await import('./agent/loop.js');
+        return runTeamCommand(args.slice(1), {
+            print: (s) => console.log(s),
+            identity: () => getAuthorIdentity(),
+            noSap,
+            // Standalone: no connection is offered at all, so nothing in `team` can reach for one.
+            connect: noSap ? undefined : async (alias) => {
+                const { loadConfig } = await import('./config/loader.js');
+                const { getConnection } = await import('./sap/connection-manager.js');
+                const { AdtClient } = await import('@cspeach/sap-client');
+                const cfg = await loadConfig();
+                const name = alias ?? sapAlias ?? Object.keys(cfg.sap)[0];
+                if (!name || !cfg.sap[name])
+                    throw new Error('No SAP system is configured. Run: cspeach config add-sap');
+                const adt = new AdtClient(await getConnection(name, cfg.sap[name]));
+                return {
+                    sql: (q, max) => adt.sqlQuery(q, max),
+                    system: { sid: name },
+                    atc: { runSet: (refs, variant, opts) => adt.atcRunSet(refs, variant, opts) },
+                };
+            },
+            ask: async (question) => {
+                const { isHeadless } = await import('./renderer/tty.js');
+                if (isHeadless())
+                    return '';
+                const { input } = await import('@inquirer/prompts');
+                return input({ message: question });
+            },
+        });
+    }
+    // Typed from yesterday's notes. Without this the words fall through to the
+    // one-shot path at the bottom of this function and are sent to the model as
+    // a PAID prompt on a machine that is configured and logged in. A hint, not
+    // an alias: the old family does not run, and nothing is renamed back.
+    if (args[0] === 'project' && TEAM_SUBCOMMANDS.has(args[1] ?? '')) {
+        console.log('Unknown command: cspeach project. Team projects use: cspeach team init|join|lane|refresh|status|outbox|rule|leave');
+        return 1;
+    }
     if (args[0] === 'analyze' && args[1] === 'project-context') {
         const { runProjectContextImpactCommand } = await import('./commands/project-context-impact.js');
         return runProjectContextImpactCommand(args.slice(2));
@@ -162,32 +208,40 @@ export async function main(argv) {
     return runRepl({ sapAlias, noSap });
 }
 function printHelp() {
-    console.log(`
-CSPeach — AI-assisted ABAP development CLI
-
-Usage:
-  cspeach                           Start interactive REPL
-  cspeach "<prompt>"                One-shot — runs one turn and exits
-  cspeach --one-shot "<prompt>"     Same as above, explicit flag
-  cspeach --sap-alias <name>        Use a specific SAP alias (overrides default)
-  cspeach --no-sap                  Start without a SAP system (paste-mode skills only)
-  cspeach --resume [id]             Resume a previous session (list if no id)
-  cspeach config add-sap            Add a SAP system interactively
-  cspeach config standalone         Set the standalone SAP profile (no system)
-  cspeach standards init            Capture your team's ABAP development standards
-  cspeach configure                 Alias for \`cspeach config add-sap\`
-  cspeach config set <key> <value>  Update a config key
-  cspeach config unset <key>        Remove a config key (revert to default)
-  cspeach config show [key]         Show config (full or single key)
-  cspeach doctor                    Diagnose install + connectivity
-  cspeach login                     Sign in via device-code flow
-  cspeach logout                    Sign out (keep keychain key, if any)
-  cspeach whoami                    Print current account info
-  cspeach analyze project-context   Compare flag-on vs flag-off session metrics
-  cspeach --upgrade                 Upgrade to latest via npm
-  cspeach --version                 Print version
-  cspeach --help                    Show this help
-
-Docs: https://cspeach.dev
+    console.log(`
+CSPeach — AI-assisted ABAP development CLI
+
+Usage:
+  cspeach                           Start interactive REPL
+  cspeach "<prompt>"                One-shot — runs one turn and exits
+  cspeach --one-shot "<prompt>"     Same as above, explicit flag
+  cspeach --sap-alias <name>        Use a specific SAP alias (overrides default)
+  cspeach --no-sap                  Start without a SAP system (paste-mode skills only)
+  cspeach --resume [id]             Resume a previous session (list if no id)
+  cspeach config add-sap            Add a SAP system interactively
+  cspeach config standalone         Set the standalone SAP profile (no system)
+  cspeach standards init            Capture your team's ABAP development standards
+  cspeach configure                 Alias for \`cspeach config add-sap\`
+  cspeach config set <key> <value>  Update a config key
+  cspeach config unset <key>        Remove a config key (revert to default)
+  cspeach config show [key]         Show config (full or single key)
+  cspeach doctor                    Diagnose install + connectivity
+  cspeach login                     Sign in via device-code flow
+  cspeach logout                    Sign out (keep keychain key, if any)
+  cspeach whoami                    Print current account info
+  cspeach team init <folder>        Lead: pull the object list from SAP, start a team project
+  cspeach team join <folder>        Record your results against a team project (on this laptop only)
+  cspeach team lane add|list        Lead: who owns which packages
+  cspeach team refresh --lane <id>  Measure with ATC: what is verified, what did not hold
+  cspeach team status [folder]      Where every object stands, who owns it, what is proven
+  cspeach team outbox               What this laptop has recorded, and where
+  cspeach team rule T N <d>         Lead: settle a conflicting decision
+  cspeach team leave                Stop recording
+  cspeach analyze project-context   Compare flag-on vs flag-off session metrics
+  cspeach --upgrade                 Upgrade to latest via npm
+  cspeach --version                 Print version
+  cspeach --help                    Show this help
+
+Docs: https://cspeach.dev
 `);
 }

package/dist/commands/compact.js

@@ -29,6 +29,7 @@ import path from 'node:path';
 import chalk from 'chalk';
 import { sessionsDir } from '../config/paths.js';
 import { saveSession } from '../session/store.js';
+import { isUserPrompt } from '../session/user-prompt.js';
 /** Keep this many recent user-prompt anchored turns verbatim. */
 export const KEEP_RECENT_TURNS = 5;
 /** Don't bother compacting if there's only a handful of older turns. */
@@ -58,8 +59,9 @@ keepRecentTurns = KEEP_RECENT_TURNS) {
     let cutAt = 0;
     for (let i = messages.length - 1; i >= 0; i--) {
         const msg = messages[i];
-        // A user PROMPT (not a tool_result block) — content is a string.
-        if (msg.role === 'user' && typeof msg.content === 'string') {
+        // A user PROMPT (not a tool_result round) — string content, or an
+        // image-attachment prompt ([image…, text]).
+        if (isUserPrompt(msg)) {
             userPromptsSeen++;
             if (userPromptsSeen === keepRecentTurns) {
                 cutAt = i;
@@ -134,6 +136,8 @@ export function serialiseForSummariser(messages) {
                     return '';
                 if (b.type === 'text')
                     return b.text ?? '';
+                if (b.type === 'image')
+                    return '[image]';
                 if (b.type === 'thinking')
                     return `[thinking: ${(b.thinking ?? '').slice(0, 200)}]`;
                 if (b.type === 'tool_use')

package/dist/commands/project-context-impact.js

@@ -24,6 +24,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import chalk from 'chalk';
 import { sessionsDir } from '../config/paths.js';
+import { userPromptText } from '../session/user-prompt.js';
 /**
  * Read all session JSONs in `dir` (defaults to sessionsDir()), classify
  * each by whether the flag was on, and produce a comparison report.
@@ -134,8 +135,7 @@ async function readAllSessions(dir) {
 function toMetrics(s) {
     const firstUser = s.messages.find((m) => m.role === 'user');
     const flagOn = firstUser !== undefined &&
-        typeof firstUser.content === 'string' &&
-        firstUser.content.includes('<project_context');
+        (userPromptText(firstUser)?.includes('<project_context') ?? false);
     // Count "turns" as user messages — each user message kicks off a model turn.
     const turnCount = s.messages.filter((m) => m.role === 'user').length;
     const usage = s.usage ?? { input_tokens: 0, output_tokens: 0, cache_read_input_tokens: 0 };