@illuminis/comprism 0.1.5 → 0.1.6

package/out/commands/privacy.js

@@ -45,8 +45,8 @@ async function cmdPrivacy() {
     const reply = await (0, gateway_1.ask)({ intent: "privacy", prompt: "" });
     if (!reply.ok || reply.served === false) {
         out(ui.fail(reply.served === false
-            ? "Your workspace is running an older build that does not answer this yet."
-            : `Your workspace could not be reached: ${reply.message || "no answer"}`));
+            ? "Your organization is running an older build that does not answer this yet."
+            : `Your organization could not be reached: ${reply.message || "no answer"}`));
         return 1;
     }
     out();

package/out/commands/repl.js

@@ -80,7 +80,7 @@ const keyboard_1 = require("../lib/keyboard");
 const machine_1 = require("../lib/machine");
 const ui = __importStar(require("../lib/ui"));
 const render_1 = require("../agent/render");
-const shell_1 = require("../executor/shell");
+const shell_1 = require("../machine/executor/shell");
 const voice = __importStar(require("../lib/voice"));
 const out = (s = '') => process.stdout.write(s + '\n');
 /**
@@ -285,7 +285,7 @@ function sessionWords() {
     return [...COMMANDS, 'project', 'folders', 'instructions', 'remember', 'detach', 'output', 'processes', 'stop', 'agents'];
 }
 async function refreshList() {
-    const { resolveProject } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
+    const { resolveProject } = await Promise.resolve().then(() => __importStar(require('../machine/folder/project')));
     const root = resolveProject(await sessionFolder(), place.added).root;
     const got = await (0, commandlist_1.fetchCommandList)(root, sessionWords());
     // A failed refresh keeps the list already held rather than emptying it.
@@ -356,11 +356,12 @@ async function showHelpers() {
     out();
 }
 /** The permission modes, in the order Shift+Tab moves through them (4.5). */
+/** The modes Shift+Tab steps through, as the service last listed them. */
 const MODES = ['read_only', 'approve_writes', 'auto_edit', 'full_auto'];
 /** How the next job in this session runs: its mode and whether it plans first
  *  (manual 4.1, 4.5). Changed by `mode`, Shift+Tab, `plan` and `plan off`, and
  *  applied from the next job; the service still decides what each mode allows. */
-const steering_ = { mode: 'approve_writes', plan: false, pin: '', effort: '' };
+const steering_ = { mode: 'approve_writes', plan: false, pin: '', effort: '', modes: MODES };
 /**
  * The line as a command, with a leading slash taken off.
  *
@@ -623,7 +624,7 @@ function printHelp() {
     out();
     drawList(listedItems());
     if (!listed?.ok) {
-        out(ui.c.amber('  Your workspace could not be asked for its skills, so only this tool\'s own words are shown.'));
+        out(ui.c.amber('  Your organization could not be asked for its skills, so only this tool\'s own words are shown.'));
         out();
     }
     else if (listed.needsUpdate.length > 0) {
@@ -645,9 +646,42 @@ function printHelp() {
 /**
  * The folders this session works in (manual 2.1 and 2.3). `project <path>`
  * changes the folder for the rest of the session; `folders add <path>` allows
- * another. Neither changes the saved default, which is `comprism project`.
+ * another. Neither changes the saved default, which is `comprism workspace`.
  */
-const place = { folder: null, added: [] };
+const place = { folder: null, added: [], workspace: '' };
+/**
+ * One command the service runs itself (web manual 13.2, 13.3). The service says
+ * what it means and writes every line; this answers whether a folder exists on
+ * this computer when asked, prints the lines, and carries out the one action it
+ * names. True when the session's workspace or folders changed; the request to
+ * run when a next step was chosen.
+ */
+async function serviceCommand(words) {
+    const { runServiceCommand } = await Promise.resolve().then(() => __importStar(require('../lib/servicecommand')));
+    const said = await runServiceCommand(words, { cwd: await sessionFolder(), current: place.workspace });
+    if (!said.reached) {
+        out(ui.fail(said.message || 'Your organization could not answer that.'));
+        return false;
+    }
+    for (const line of said.lines)
+        out(line);
+    const a = said.action;
+    if (!a)
+        return false;
+    if (a.run)
+        return a.run;
+    if (a.open_workspace)
+        place.workspace = a.open_workspace;
+    if (a.use_folder) {
+        place.folder = a.use_folder;
+        (await Promise.resolve().then(() => __importStar(require('../lib/project-ops')))).useSessionFolder(a.use_folder);
+    }
+    if (a.add_folder && !place.added.includes(a.add_folder))
+        place.added.push(a.add_folder);
+    if (a.remove_folder)
+        place.added = place.added.filter((f) => f !== a.remove_folder);
+    return true;
+}
 async function sessionFolder() {
     if (place.folder)
         return place.folder;
@@ -656,7 +690,7 @@ async function sessionFolder() {
 }
 /** The line this session begins with, as the service wrote it (manual 2.2). */
 async function projectLine() {
-    const { resolveProject, asWire } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
+    const { resolveProject, asWire } = await Promise.resolve().then(() => __importStar(require('../machine/folder/project')));
     const { ask } = await Promise.resolve().then(() => __importStar(require('../lib/gateway')));
     const facts = resolveProject(await sessionFolder(), place.added);
     const reply = await ask({ intent: 'project', prompt: '', project: asWire(facts, 'approve_writes') });
@@ -685,7 +719,7 @@ async function contextOf(intent, jobId, keep = '', sessionKey) {
         intent, prompt: keep, ...(jobId ? { jobId } : {}), ...(sessionKey ? { spendSession: sessionKey } : {}),
     });
     if (!reply.ok || !reply.context) {
-        out(ui.fail(reply.message || 'Your workspace could not answer that.'));
+        out(ui.fail(reply.message || 'Your organization could not answer that.'));
     }
     else {
         for (const line of reply.context.lines)
@@ -704,7 +738,7 @@ async function showTranscript(jobId) {
     const { ask } = await Promise.resolve().then(() => __importStar(require('../lib/gateway')));
     const reply = await ask({ intent: 'transcript', prompt: '', jobId });
     if (!reply.ok || !reply.transcript) {
-        out(ui.fail(reply.message || 'The transcript could not be read from your workspace.'));
+        out(ui.fail(reply.message || 'The transcript could not be read from your organization.'));
     }
     else {
         for (const line of reply.transcript.lines)
@@ -1022,7 +1056,7 @@ async function runRepl(how = {}) {
         });
     }
     if (!state.reached) {
-        out(ui.fail(`Your workspace could not be reached, so ${ui.c.bold('nothing is known')} about your keys.`));
+        out(ui.fail(`Your organization could not be reached, so ${ui.c.bold('nothing is known')} about your keys.`));
         out(`      ${ui.c.dim(state.why)}`);
         out(`      ${ui.c.dim('check the address with')} ${ui.c.bold('comprism status')}${ui.c.dim(', or sign in again with')} ${ui.c.bold('comprism login')}`);
         out();
@@ -1059,6 +1093,14 @@ async function runRepl(how = {}) {
         }
         steering_.pin = said.pin ?? '';
         steering_.effort = said.effort === 'normal' ? '' : said.effort;
+        // Mode and plan are the service's too (CLI manual 4.1, 4.5); kept here only
+        // to send with the next job and to draw the prompt.
+        if (said.mode)
+            steering_.mode = said.mode;
+        if (typeof said.plan === 'boolean')
+            steering_.plan = said.plan;
+        if (said.modes?.length)
+            steering_.modes = said.modes;
         return said;
     };
     if (how.latest || how.resume || how.pick) {
@@ -1346,7 +1388,7 @@ async function runRepl(how = {}) {
      * a drag and drop, and the files wait for the question that follows.
      */
     const gather = async (typed) => {
-        const { resolveProject } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
+        const { resolveProject } = await Promise.resolve().then(() => __importStar(require('../machine/folder/project')));
         const here = await sessionFolder();
         const root = resolveProject(here, place.added).root;
         completion.root = root;
@@ -1639,11 +1681,15 @@ async function runRepl(how = {}) {
     keys().on('keypress', (_s, key) => {
         if (!key || key.name !== 'tab' || !key.shift || working || answering || leaving)
             return;
-        const next = MODES[(MODES.indexOf(steering_.mode) + 1) % MODES.length];
-        steering_.mode = next;
+        // The next mode in the service's own list, set by the service.
+        const modes = steering_.modes;
+        const next = modes[(modes.indexOf(steering_.mode) + 1) % modes.length];
         out();
-        out(ui.c.dim(`  mode ${ui.c.bold(next)}, from the next job`));
-        prompt();
+        void steer({ mode: next }).then((said) => {
+            for (const line of said?.lines ?? [])
+                out(ui.c.dim(line));
+            prompt();
+        });
     });
     async function handle(line) {
         const typed = line.trim();
@@ -1669,38 +1715,27 @@ async function runRepl(how = {}) {
             out();
             return prompt();
         }
-        const where = /^(project|workspace)(?:\s+(.+))?$/i.exec(bare);
-        const addFolder = /^folders\s+add\s+(.+)$/i.exec(bare);
-        if (where || addFolder || /^folders$/i.test(bare)) {
-            const { checkFolder, resolveProject } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
-            const named = where ? where[2] : addFolder ? addFolder[1] : undefined;
-            if (named) {
-                const found = checkFolder(named.trim());
-                if (!found.ok) {
-                    out(ui.fail(found.why));
-                    out();
-                    return prompt();
-                }
-                if (where) {
-                    place.folder = found.path;
-                    (await Promise.resolve().then(() => __importStar(require('../lib/project-ops')))).useSessionFolder(found.path);
-                }
-                else if (!place.added.includes(found.path))
-                    place.added.push(found.path);
-            }
-            if (/^folders$/i.test(bare)) {
-                const facts = resolveProject(await sessionFolder(), place.added);
-                out();
-                out(`  ${ui.c.bold(facts.root)}  ${ui.c.dim('project')}`);
-                for (const f of facts.added)
-                    out(`  ${ui.c.bold(f)}  ${ui.c.dim('added for this session')}`);
-                out();
-                return prompt();
-            }
+        // Commands the service runs itself (web manual 13.2, 13.3): any word the
+        // service lists as its own, and `project`, the old name for `workspace`.
+        // What they mean and every line printed are the service's; this sends what
+        // was typed, answers whether a folder exists, and carries out the action.
+        const head = (bare.split(/\s+/)[0] ?? '').toLowerCase();
+        const { waitingNextSteps } = await Promise.resolve().then(() => __importStar(require('../agent/session')));
+        const serviceWord = head === 'project'
+            || (/^\d+$/.test(bare) && waitingNextSteps > 0)
+            || (listed?.items ?? []).some((i) => i.source === 'service' && i.name === head);
+        if (serviceWord) {
+            const words = head === 'project' ? bare.replace(/^project\b/i, 'workspace') : bare;
+            const acted = await serviceCommand(words);
             out();
-            await showProjectLine();
-            // Another folder has other skills.
-            await refreshList();
+            // A next step chosen: it runs as the request it stands for.
+            if (typeof acted === 'string')
+                return handle(`work ${acted}`);
+            if (acted) {
+                await showProjectLine();
+                // Another folder has other skills.
+                await refreshList();
+            }
             return prompt();
         }
         // `pin <model>` and `effort <level>` (manual 4.17, 4.18), kept by the
@@ -1736,16 +1771,12 @@ async function runRepl(how = {}) {
         }
         const effortTo = /^effort\s+(\S+)$/.exec(word);
         if (effortTo) {
-            const level = effortTo[1];
-            if (!['low', 'medium', 'normal', 'high'].includes(level))
-                out(ui.fail('Effort is low, normal or high.'));
-            else {
-                const said = await steer({ effort: level === 'medium' ? 'normal' : level });
-                if (said) {
-                    out(ui.c.dim(`  effort ${ui.c.bold(said.effort)} for the next requests`));
-                    if (said.effort_note)
-                        out(ui.c.dim(`  ${said.effort_note}`));
-                }
+            // The service checks the word and says what is allowed.
+            const said = await steer({ effort: effortTo[1] });
+            if (said) {
+                out(ui.c.dim(`  effort ${ui.c.bold(said.effort)} for the next requests`));
+                if (said.effort_note)
+                    out(ui.c.dim(`  ${said.effort_note}`));
             }
             out();
             return prompt();
@@ -1753,20 +1784,16 @@ async function runRepl(how = {}) {
         // `mode <name>` and `plan off` (manual 4.1, 4.5).
         const modeTo = /^mode\s+(\S+)$/.exec(word);
         if (modeTo) {
-            const named = modeTo[1];
-            if (!MODES.includes(named)) {
-                out(ui.fail(`${named} is not a permission mode. One of: ${MODES.join(', ')}`));
-            }
-            else {
-                steering_.mode = named;
-                out(ui.c.dim(`  mode ${ui.c.bold(named)}, from the next job`));
-            }
+            const said = await steer({ mode: modeTo[1] });
+            for (const line of said?.lines ?? [])
+                out(ui.c.dim(line));
             out();
             return prompt();
         }
         if (word === 'plan off') {
-            steering_.plan = false;
-            out(ui.c.dim('  planning off: the next requests are carried out'));
+            const said = await steer({ plan: false });
+            for (const line of said?.lines ?? [])
+                out(ui.c.dim(line));
             out();
             return prompt();
         }
@@ -1784,7 +1811,7 @@ async function runRepl(how = {}) {
         // `output 3`: a command's whole output, kept on this machine (5.12).
         const outputOf = /^output(?:\s+(\d+))?$/.exec(word);
         if (outputOf) {
-            const { keptOutput } = await Promise.resolve().then(() => __importStar(require('../executor/shell')));
+            const { keptOutput } = await Promise.resolve().then(() => __importStar(require('../machine/executor/shell')));
             const kept = outputOf[1] ? keptOutput(Number(outputOf[1])) : undefined;
             if (!outputOf[1])
                 out(ui.c.dim('  output N shows the whole output of command N, the number on its line.'));
@@ -1893,16 +1920,20 @@ async function runRepl(how = {}) {
         }
         if (COMMANDS.has(word)) {
             switch (word) {
-                case 'plan':
-                    steering_.plan = true;
-                    out(ui.c.dim('  planning on: the next requests are planned first and change nothing. `plan off` stops.'));
+                case 'plan': {
+                    const said = await steer({ plan: true });
+                    for (const line of said?.lines ?? [])
+                        out(ui.c.dim(line));
                     out();
                     break;
-                case 'mode':
-                    out(`  ${ui.c.dim('mode')} ${ui.c.bold(steering_.mode)}${steering_.plan ? ui.c.dim(', planning first') : ''}`);
-                    out(ui.c.dim(`  one of ${MODES.join(', ')}. \`mode <name>\` or Shift+Tab changes it.`));
+                }
+                case 'mode': {
+                    const said = await steer({});
+                    for (const line of said?.lines ?? [])
+                        out(ui.c.dim(line));
                     out();
                     break;
+                }
                 case 'pin': {
                     const said = await steer({});
                     out(said?.pin
@@ -2096,17 +2127,10 @@ async function runRepl(how = {}) {
                 // session the moment two are open, and this one is on the screen.
                 case 'cost':
                 case 'spend': {
-                    // Nothing sent is nothing charged, and the service has no record of
-                    // a session before its first job, so it would answer "no such
-                    // session" to a person checking that a refusal cost them nothing
-                    // (manual 6.1).
-                    if (session.jobs.length === 0) {
-                        out(`  ${ui.c.dim('session')} ${ui.c.bold(session.id)}  ${ui.c.dim('nothing has run yet, so it has cost')} $0.00`);
-                        out();
-                        break;
-                    }
+                    // Nothing sent is nothing charged: the service answers even before
+                    // the first job, so a refusal can be checked as costing nothing (6.1).
                     const { cmdCost } = await Promise.resolve().then(() => __importStar(require('./cost')));
-                    await cmdCost([session.id]);
+                    await cmdCost([session.serverId || session.id]);
                     break;
                 }
                 case 'model': {

package/out/commands/review.js

@@ -52,8 +52,8 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const ui = __importStar(require("../lib/ui"));
 const gateway_1 = require("../lib/gateway");
-const project_1 = require("../lib/project");
-const project_2 = require("../lib/project");
+const project_1 = require("../machine/folder/project");
+const project_2 = require("../machine/folder/project");
 const out = (s = "") => process.stdout.write(`${s}\n`);
 const err = (s = "") => process.stderr.write(`${s}\n`);
 async function review(op, payload, cwd = process.cwd()) {
@@ -62,9 +62,9 @@ async function review(op, payload, cwd = process.cwd()) {
 }
 function refused(reply) {
     if (!reply.ok)
-        return reply.message || "Your workspace could not be reached.";
+        return reply.message || "Your organization could not be reached.";
     if (reply.served === false)
-        return "Your workspace is running an older build that does not answer this yet.";
+        return "Your organization is running an older build that does not answer this yet.";
     if (reply.granted === false)
         return reply.message || "Refused.";
     return null;
@@ -162,7 +162,7 @@ async function cmdRewind(args, confirmWith) {
     for (const item of items) {
         const where = inside(project.root, item.path);
         if (!where) {
-            results.push({ path: item.path, result: "outside this project, not restored" });
+            results.push({ path: item.path, result: "outside this workspace, not restored" });
             continue;
         }
         // Your later changes are never overwritten (7.4): the file must still be
@@ -190,7 +190,7 @@ async function cmdRewind(args, confirmWith) {
             else if (item.action === "rename_back" && item.to) {
                 const from = inside(project.root, item.to);
                 if (!from)
-                    throw new Error("the new name is outside this project");
+                    throw new Error("the new name is outside this workspace");
                 fs.mkdirSync(path.dirname(where), { recursive: true });
                 if (fs.existsSync(from))
                     fs.renameSync(from, where);

package/out/commands/settings.js

@@ -41,29 +41,9 @@ exports.currentWorkspace = currentWorkspace;
 exports.cmdProviders = cmdProviders;
 exports.cmdModel = cmdModel;
 exports.cmdProject = cmdProject;
-/**
- * The three things a person sets once and then forgets: which model they are
- * compared against, which vendors they can reach, and which folder they work in.
- *
- * ── What is stored here, and what is not ──────────────────────────────────
- *
- * A PREFERENCE lives on this machine: the model you would otherwise have used,
- * and the folder you work in. Neither is a secret and neither is model logic;
- * they are two facts about you, and a round trip to ask us for them would be
- * slower and no safer.
- *
- * THE MODEL LIST does not live here. It comes from our server on every call,
- * because the models and their prices are ours, and because a copy on a
- * customer's laptop goes stale the day a vendor changes a price. A stale price
- * silently corrupts every figure downstream of it, which is the exact failure
- * this product exists to replace.
- */
-const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const prompt_1 = require("../lib/prompt");
 const gateway_1 = require("../lib/gateway");
 const config_1 = require("../lib/config");
-const project_1 = require("../lib/project");
 const ui = __importStar(require("../lib/ui"));
 const out = (s = '') => process.stdout.write(s + '\n');
 /** Where the chosen folder is remembered. Beside the rest of the settings. */
@@ -78,12 +58,10 @@ function workspaceFile() {
  * current one would be a trap.
  */
 function currentWorkspace() {
-    try {
-        const saved = JSON.parse(node_fs_1.default.readFileSync(workspaceFile(), 'utf8'));
-        if (saved.path && node_fs_1.default.existsSync(saved.path))
-            return { path: saved.path, source: 'saved' };
-    }
-    catch { /* nothing saved, which is the normal case */ }
+    // The folder you are standing in, as in every other terminal tool. A folder
+    // saved on this laptop used to override it; workspaces now live on the
+    // service, the same in every client, and `workspace <name>` opens another
+    // (web manual 13.2).
     return { path: process.cwd(), source: 'cwd' };
 }
 /**
@@ -107,8 +85,8 @@ async function cmdProviders() {
     // have, which is the fault reported on 17 September 2026.
     if (!reply.ok || reply.served === false || reply.complete === false
         || !reply.providers || reply.providers.length === 0) {
-        out(ui.fail('Your workspace could not tell us which vendors it can reach.'));
-        out(`      ${ui.c.dim(reply.message || reply.decision.rationale || 'no answer from the workspace')}`);
+        out(ui.fail('Your organization could not tell us which vendors it can reach.'));
+        out(`      ${ui.c.dim(reply.message || reply.decision.rationale || 'no answer from the organization')}`);
         out(`      ${ui.c.dim('check the address with')} ${ui.c.bold('comprism status')}`);
         out();
         process.exitCode = 1;
@@ -136,111 +114,40 @@ async function cmdProviders() {
  * have used, which is the only thing a saving can honestly be measured against.
  */
 async function cmdModel(args) {
-    const cfg = (0, config_1.loadConfig)();
-    const named = args.find((a) => !a.startsWith('--'));
-    out(ui.banner('Your comparison model'));
-    out();
-    out(ui.c.dim('  The model you would have used anyway. Savings are measured against it.'));
-    out(`  ${ui.c.dim('Now:')} ${ui.c.bold(cfg.defaultModel || 'not set')}`);
-    out();
-    const reply = await (0, gateway_1.ask)({ intent: 'catalog', prompt: '' });
-    const models = (reply.providers || []).flatMap((p) => p.models);
-    // Same rule as every other reader: an answer we did not get is not an answer
-    // of none.
-    if (!reply.ok || reply.served === false || reply.complete === false
-        || models.length === 0) {
-        out(ui.fail('Your workspace could not tell us which models it can reach.'));
-        out(`      ${ui.c.dim(reply.message || reply.decision.rationale || 'no answer from the workspace')}`);
-        out();
-        process.exitCode = 1;
-        return;
-    }
-    const match = (value) => models.find((m) => m.id === value || m.key === value
-        || m.label.toLowerCase() === value.toLowerCase());
-    let chosen = named ? match(named) : undefined;
-    if (named && !chosen) {
-        out(ui.fail(`No model called "${named}".`));
-        out(`      ${ui.c.dim('see the list with')} ${ui.c.bold('comprism providers')}`);
-        out();
+    // The comparison model is the person's own setting on the service, the same
+    // in every client (service catalog 14); the service lists, checks and words it.
+    const named = args.filter((a) => !a.startsWith('--')).join(' ');
+    const reply = await (0, gateway_1.ask)({
+        intent: 'command', prompt: '', payload: { words: `model ${named}`.trim() },
+    });
+    if (!reply.lines?.length) {
+        out(ui.fail(reply.message || 'Your organization could not answer that.'));
         process.exitCode = 1;
         return;
     }
-    if (!chosen) {
-        models.forEach((m, i) => {
-            const n = String(i + 1).padStart(2);
-            out(`  ${n}. ${m.label.padEnd(24)} ${ui.c.dim(`${m.provider}  ${m.tier}`)}`);
-        });
-        out();
-        const answer = await (0, prompt_1.ask)('  number, or a model name: ');
-        (0, prompt_1.closePrompt)();
-        if (!answer) {
-            out(ui.info('Left as it was.'));
-            out();
-            return;
-        }
-        const asNumber = Number(answer);
-        chosen = Number.isInteger(asNumber) && asNumber >= 1 && asNumber <= models.length
-            ? models[asNumber - 1]
-            : match(answer);
-        if (!chosen) {
-            out(ui.fail(`"${answer}" is not on the list.`));
-            out();
-            process.exitCode = 1;
-            return;
-        }
-    }
-    (0, config_1.saveConfig)({ ...cfg, defaultModel: chosen.id });
     out();
-    out(ui.ok(`Comparing against ${ui.c.bold(chosen.label)}.`));
-    out(`      ${ui.c.dim('every receipt from now on prices your work against this model')}`);
+    for (const line of reply.lines)
+        out(line);
     out();
+    if (reply.granted === false)
+        process.exitCode = 1;
 }
 async function cmdProject(args) {
-    const named = args.find((a) => !a.startsWith('--'));
-    const current = currentWorkspace();
-    out(ui.banner('Project folder'));
-    out();
-    out(`  ${ui.c.bold(current.path)}`);
-    out(`      ${ui.c.dim(current.source === 'cwd'
-        ? 'the folder you are standing in'
-        : 'saved, so it is used wherever you run the command from')}`);
-    out();
-    if (args.includes('--clear')) {
-        try {
-            node_fs_1.default.unlinkSync(workspaceFile());
-        }
-        catch { /* nothing was saved */ }
-        out(ui.ok('Cleared. The folder you are standing in is used again.'));
-        out();
-        return;
-    }
-    // `comprism project` on its own shows the folder (manual 2.1). Asking only
-    // when a person is at the keyboard and typed nothing, as before.
-    let target = named;
-    if (!target) {
-        if (!process.stdin.isTTY)
-            return;
-        const answer = await (0, prompt_1.ask)('  new folder, or enter to keep it: ');
-        (0, prompt_1.closePrompt)();
-        if (!answer) {
-            out(ui.info('Left as it was.'));
-            out();
-            return;
-        }
-        target = answer;
-    }
-    const found = (0, project_1.checkFolder)(target);
-    if (!found.ok) {
-        out(ui.fail(found.why));
-        out();
-        process.exitCode = 2;
+    // `comprism workspace ...` typed at the shell: the same service command a
+    // session runs (web manual 13.2). Opening one takes effect in a session.
+    const { runServiceCommand } = await Promise.resolve().then(() => __importStar(require('../lib/servicecommand')));
+    const said = await runServiceCommand(['workspace', ...args].join(' ').trim(), { cwd: process.cwd() });
+    if (!said.reached) {
+        out(ui.fail(said.message || 'Your organization could not answer that.'));
+        process.exitCode = 1;
         return;
     }
-    node_fs_1.default.mkdirSync((0, config_1.homeDir)(), { recursive: true });
-    node_fs_1.default.writeFileSync(workspaceFile(), JSON.stringify({ path: found.path }, null, 2), { mode: 0o600 });
-    out(ui.ok(`Project folder set to ${ui.c.bold(found.path)}.`));
-    out(`      ${ui.c.dim('clear it with')} ${ui.c.bold('comprism project --clear')}`);
     out();
+    for (const line of said.lines)
+        out(line);
+    out();
+    if (!said.ok)
+        process.exitCode = 1;
 }
 /** The older name, kept so nothing that calls it breaks. */
 exports.cmdWorkspace = cmdProject;

package/out/commands/skills.js

@@ -50,7 +50,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const commandlist_1 = require("../lib/commandlist");
 const gateway_1 = require("../lib/gateway");
-const project_1 = require("../lib/project");
+const project_1 = require("../machine/folder/project");
 const ui = __importStar(require("../lib/ui"));
 const ROUNDS = 6;
 /** What a folder sent with `add` may hold, beside its SKILL.md. The service
@@ -65,7 +65,7 @@ async function skillRows(folder, op = "list") {
         const reply = await (0, gateway_1.ask)({ intent: "skills", prompt: "", skillsPayload: { op, round, files, listings, project: root } });
         const body = reply.skills;
         if (!reply.ok || reply.served === false || !body) {
-            return { rows: [], error: reply.message || "The skill list could not be read from your workspace." };
+            return { rows: [], error: reply.message || "The skill list could not be read from your organization." };
         }
         if (!body.wants) {
             return op === "check"

package/out/commands/unattended.js

@@ -53,8 +53,8 @@ const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
 const ui = __importStar(require("../lib/ui"));
 const queue_1 = require("../lib/queue");
-const project_1 = require("../lib/project");
-const self_1 = require("../lib/self");
+const project_1 = require("../machine/folder/project");
+const self_1 = require("../machine/runtime/self");
 const out = (s = "") => process.stdout.write(`${s}\n`);
 const err = (s = "") => process.stderr.write(`${s}\n`);
 /** Values typed after flags, so they are never read as the request. */
@@ -64,9 +64,9 @@ function words(args) {
 }
 function failed(reply) {
     if (!reply.ok)
-        return reply.message || "Your workspace could not be reached.";
+        return reply.message || "Your organization could not be reached.";
     if (reply.served === false)
-        return "Your workspace is running an older build that does not answer this yet.";
+        return "Your organization is running an older build that does not answer this yet.";
     if (reply.granted === false)
         return reply.message || "Refused.";
     return null;
@@ -216,7 +216,7 @@ async function runCloud(job) {
             }
         }
         const base = git(work, ["rev-parse", "HEAD"]).out.trim();
-        const { availability } = await Promise.resolve().then(() => __importStar(require("../executor/sandbox")));
+        const { availability } = await Promise.resolve().then(() => __importStar(require("../machine/executor/sandbox")));
         const code = await runJob(job, work, availability().system ? ["--sandbox"] : []);
         git(work, ["add", "-A"]);
         const patch = git(work, ["diff", "--cached", "--binary", base]).out;
@@ -258,7 +258,7 @@ async function cmdWorker(args) {
             else {
                 const folder = job.project_root && fs.existsSync(job.project_root) ? job.project_root : null;
                 if (!folder) {
-                    await (0, queue_1.queue)("failed", { id: job.id, why: `the project folder ${job.project_root} is not on this machine` });
+                    await (0, queue_1.queue)("failed", { id: job.id, why: `the workspace folder ${job.project_root} is not on this machine` });
                 }
                 else {
                     const code = await runJob(job, folder);

package/out/commands/update.js

@@ -50,7 +50,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const ui = __importStar(require("../lib/ui"));
 const gateway_1 = require("../lib/gateway");
-const self_1 = require("../lib/self");
+const self_1 = require("../machine/runtime/self");
 const version_1 = require("../lib/version");
 const install_1 = require("./install");
 const out = (s = "") => process.stdout.write(`${s}\n`);