soja-cli 1.4.0 → 1.5.1

package/README.md

@@ -6,7 +6,7 @@
 ▄▄▄▄▄▄█▀  ▀█▄▄▄▄█▀  ▀█▄▄▄▄█▀  ██    ██ ▄▄▄
 ```
 
-**Software Operations & Job Assistant** · v1.4.0 · by Enmauel.biz
+**Software Operations & Job Assistant** · v1.5.1 · by Enmauel.biz
 
 > No dashboards. No browser. No bullshit. Just work.
 

package/dist/application/services/index.js

@@ -1,5 +1,6 @@
 import { GitConsole } from '../../git/console.js';
 import { FolderService } from './folder-service.js';
+import { PreferenceService } from './preference-service.js';
 import { GitWorkflowService } from './git-workflow-service.js';
 import { ProjectService } from './project-service.js';
 import { SessionService } from './session-service.js';
@@ -16,6 +17,7 @@ export function createServices(repos, config, options) {
         tasks,
         git: new GitWorkflowService(tasks, projects, options.git),
         folders: new FolderService(config),
+        preferences: new PreferenceService(config),
         gitConsole: options.gitConsole ?? new GitConsole(),
         environment: { mode: 'local' },
         backups: options.backups,

package/dist/application/services/preference-service.js

@@ -0,0 +1,17 @@
+/** Per-machine interface preferences, kept in the config file. */
+export class PreferenceService {
+    config;
+    constructor(config) {
+        this.config = config;
+    }
+    /** Whether the interface reports the mouse. On unless turned off. */
+    mouse() {
+        return this.config.load()?.mouse ?? true;
+    }
+    /** Before setup there is no config file yet: the choice then lasts for this session only. */
+    setMouse(on) {
+        const current = this.config.load();
+        if (current)
+            this.config.save({ ...current, mouse: on });
+    }
+}

package/dist/cli/commands/info.js

@@ -40,6 +40,7 @@ const COMMANDS = [
     ['logout', 'Sign out and go back to local mode'],
     ['account delete [--yes]', 'Delete the Online account and anonymize shared authorship'],
     ['mode [local|remote]', 'Show or switch where SOJA keeps data'],
+    ['mouse [on|off]', 'Show or switch whether the interface uses the mouse (M in the interface)'],
     ['whoami', 'Current user, workspace and mode'],
     ['import-local [--from <slug>]', 'Bring local-mode projects, tasks and history to the team server (owners)'],
     ['sync [--dismiss]', 'Sync now (remote mode); shows conflicts and rejected changes'],

package/dist/cli/commands/preferences.js

@@ -0,0 +1,25 @@
+import { PreferenceService } from '../../application/services/preference-service.js';
+import { FileConfigStore } from '../../config/config.js';
+import { resolvePaths } from '../../config/paths.js';
+import { SojaError, ValidationError } from '../../domain/errors.js';
+import { bold, dim, print, success } from '../output.js';
+import { parseCommand } from './args.js';
+/** `soja mouse [on|off]`: whether the interface uses the mouse on this machine. */
+export async function mouseCommand(args) {
+    const { positionals } = parseCommand(args, {});
+    const store = new FileConfigStore(resolvePaths().configFile);
+    const preferences = new PreferenceService(store);
+    const target = positionals[0];
+    if (!target) {
+        print(`mouse ${bold(preferences.mouse() ? 'on' : 'off')}`);
+        if (process.env.SOJA_MOUSE === '0')
+            print(dim('SOJA_MOUSE=0 turns it off for this shell anyway.'));
+        return;
+    }
+    if (target !== 'on' && target !== 'off')
+        throw new ValidationError('Use `soja mouse on` or `soja mouse off`.');
+    if (!store.load())
+        throw new SojaError('SOJA is not set up yet.', { hint: 'Run `soja` once; `M` in the interface also switches the mouse.' });
+    preferences.setMouse(target === 'on');
+    success(`Mouse ${bold(target)}${target === 'off' ? dim(' · the terminal selects and copies text as usual; M in the interface turns it back on') : ''}.`);
+}

package/dist/cli/commands/tui.js

@@ -31,7 +31,7 @@ export async function runInterface(options = {}) {
         const updates = createUpdater();
         // Light or dark palette, from the terminal's own background (SOJA_THEME overrides).
         setThemeMode(await detectThemeMode());
-        const instance = render(_jsx(App, { services: runtime.services, welcomeOnLocal: savedConfig?.mode === 'remote' && !hasRemoteToken, updates: () => updates.cachedCheck(), mouse: process.env.SOJA_MOUSE !== '0', ...(options.route ? { initialRoute: options.route } : {}) }), { alternateScreen: true, exitOnCtrlC: true });
+        const instance = render(_jsx(App, { services: runtime.services, welcomeOnLocal: savedConfig?.mode === 'remote' && !hasRemoteToken, updates: () => updates.cachedCheck(), mouse: process.env.SOJA_MOUSE !== '0' && runtime.services.preferences.mouse(), ...(options.route ? { initialRoute: options.route } : {}) }), { alternateScreen: true, exitOnCtrlC: true });
         await instance.waitUntilExit();
         reopenInCurrentMode = new FileConfigStore(runtime.paths.configFile).load()?.mode !== runtime.services.environment.mode;
     }

package/dist/cli/index.js

@@ -11,6 +11,7 @@ import { chatCommand } from './commands/chat.js';
 import { importLocalCommand } from './commands/import.js';
 import { branchCommand, commitCommand, mergeCommand, pullRequestCommand, pushCommand } from './commands/git-ops.js';
 import { printHelp, printVersion } from './commands/info.js';
+import { mouseCommand } from './commands/preferences.js';
 import { projectCommand } from './commands/project.js';
 import { taskCommand } from './commands/task.js';
 import { startCommand } from './commands/start.js';
@@ -74,6 +75,8 @@ async function main(argv) {
             return whoamiCommand();
         case 'mode':
             return modeCommand(rest);
+        case 'mouse':
+            return mouseCommand(rest);
         case 'sync':
             return syncCommand(rest);
         case 'chat':

package/dist/config/config.js

@@ -28,6 +28,8 @@ export const configSchema = z
      * repository picker.
      */
     parentFolders: z.array(z.string().min(1)).default([]),
+    /** Whether the interface reports the mouse (`soja mouse on|off`, `M` in the interface). On when unset. */
+    mouse: z.boolean().optional(),
     remote: remoteSchema.optional(),
 })
     .refine((config) => config.mode !== 'remote' || config.remote !== undefined, {

package/dist/data/sync/index.js

@@ -1,6 +1,7 @@
 import { basename } from 'node:path';
 import { GitWorkflowService } from '../../application/services/git-workflow-service.js';
 import { FolderService } from '../../application/services/folder-service.js';
+import { PreferenceService } from '../../application/services/preference-service.js';
 import { ProjectService } from '../../application/services/project-service.js';
 import { TaskService } from '../../application/services/task-service.js';
 import { createLocalRepositories } from '../local/index.js';
@@ -85,6 +86,7 @@ export function createReplicaServices(api, handle, config, git, gitConsole, WebS
         ...(localDatabaseFile ? { importer: new LocalImporter(localDatabaseFile, config, api, store, engine) } : {}),
         git: new GitWorkflowService(tasks, projects, git),
         folders: new FolderService(config),
+        preferences: new PreferenceService(config),
         gitConsole,
         environment: { mode: 'remote', server: api.baseUrl },
         backups,

package/dist/git/releases.js

@@ -33,12 +33,15 @@ export class GhReleases {
 /** Public release metadata and tarballs from npm; no GitHub account is needed to update. */
 export class NpmReleases {
     packageName;
-    constructor(packageName = 'soja-cli') {
+    fetchImpl;
+    constructor(packageName = 'soja-cli', fetchImpl = fetch) {
         this.packageName = packageName;
+        this.fetchImpl = fetchImpl;
     }
     async latest() {
-        const response = await fetch(`https://registry.npmjs.org/${encodeURIComponent(this.packageName)}/latest`, {
-            headers: { accept: 'application/vnd.npm.install-v1+json' },
+        // The `/latest` document only speaks plain JSON: the abbreviated install format gets a 406.
+        const response = await this.fetchImpl(`https://registry.npmjs.org/${encodeURIComponent(this.packageName)}/latest`, {
+            headers: { accept: 'application/json' },
             signal: AbortSignal.timeout(10_000),
         });
         if (!response.ok)

package/dist/ui/Shell.js

@@ -30,6 +30,7 @@ import { AccessScreen } from './screens/AccessScreen.js';
 import { ApiClient } from '../data/remote/api-client.js';
 import { CredentialStore } from '../config/credentials.js';
 import { resolvePaths } from '../config/paths.js';
+import { useMouseToggle } from './hooks/use-mouse-toggle.js';
 /**
  * The running app, laid out like a desktop application: title bar, sidebar,
  * the screen stack in the main area, status bar, and floating windows and
@@ -73,6 +74,7 @@ function Frame() {
         const timer = setInterval(() => void followPullRequests(), 180_000);
         return () => clearInterval(timer);
     }, [followPullRequests]);
+    const mouseToggle = useMouseToggle();
     useKeys(Layer.global, (input, key) => {
         if (input === ':' || (key.ctrl && input === 'k'))
             openPalette();
@@ -90,6 +92,8 @@ function Frame() {
             go({ type: 'push', route: { name: 'workspaces' } });
         else if (input === 'A')
             go({ type: 'push', route: { name: 'access' } });
+        else if (input === 'M')
+            mouseToggle.toggle();
         else if (input === '#' && chat)
             go({ type: 'push', route: { name: 'chat' } });
         else if (key.escape && stack.length > 1)
@@ -113,7 +117,7 @@ function Frame() {
                             // The screen under a window stays visible, but only the window takes keys and clicks.
                             const active = top && !overlay;
                             return (_jsx(Box, { display: top ? 'flex' : 'none', flexDirection: "column", flexGrow: 1, children: _jsx(ActiveScope, { active: active, children: _jsx(ScreenFor, { route: entry, active: active }) }) }, `${index}:${JSON.stringify(entry)}`));
-                        }) })] }), _jsx(Box, { height: FOOTER_GAP_ROWS, flexShrink: 0 }), _jsx(StatusBar, { columns: columns, mode: overlay ? modeForOverlay(overlay) : modeFor(route), hints: hints, right: server ? undefined : 'local' }), overlay ? (_jsx(ActiveScope, { active: true, children: _jsx(OverlayFor, { overlay: overlay }) })) : null, flash ? _jsx(Toast, { flash: flash, columns: columns, rows: rows }) : null] }));
+                        }) })] }), _jsx(Box, { height: FOOTER_GAP_ROWS, flexShrink: 0 }), _jsx(StatusBar, { columns: columns, mode: overlay ? modeForOverlay(overlay) : modeFor(route), hints: hints, right: server ? undefined : 'local', mouse: { on: mouseToggle.enabled, onToggle: mouseToggle.toggle, active: !overlay } }), overlay ? (_jsx(ActiveScope, { active: true, children: _jsx(OverlayFor, { overlay: overlay }) })) : null, flash ? _jsx(Toast, { flash: flash, columns: columns, rows: rows }) : null] }));
 }
 function ScreenFor({ route, active }) {
     switch (route.name) {

package/dist/ui/chrome/StatusBar.js

@@ -1,18 +1,21 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
-import { palette } from '../theme/theme.js';
+import { Clickable } from '../kit/Clickable.js';
+import { palette, symbols } from '../theme/theme.js';
 import { APP_SLOGAN, WORDMARK_WIDTH } from '../branding/brand.js';
 import { Logo } from '../branding/Logo.js';
 import { FOOTER_BRAND_GAP_ROWS, footerRowsFor } from '../hooks/use-layout.js';
+const mouseLabel = (on) => ` ${on ? symbols.active : symbols.inactive} mouse ${on ? 'on' : 'off'} `;
 /**
  * The bottom bar: a pill with where you are, then the shortcuts that work
  * right now as keys. Shortcuts that do not fit are dropped from the end.
  */
-export function StatusBar({ columns, mode, hints, right }) {
+export function StatusBar({ columns, mode, hints, right, mouse }) {
     const footerRows = footerRowsFor(columns);
     const inlineBrand = columns >= WORDMARK_WIDTH + APP_SLOGAN.length + 4;
     const sloganWidth = inlineBrand ? columns - WORDMARK_WIDTH - 4 : columns - 2;
-    const available = columns - mode.length - 4 - (right ? right.length + 3 : 0);
+    const mouseWidth = mouse ? mouseLabel(mouse.on).length + 4 : 0;
+    const available = columns - mode.length - 4 - (right ? right.length + 3 : 0) - mouseWidth;
     const shown = [];
     let used = 0;
     for (const hint of hints) {
@@ -22,5 +25,5 @@ export function StatusBar({ columns, mode, hints, right }) {
         shown.push(hint);
         used += size;
     }
-    return (_jsxs(Box, { width: columns, height: footerRows, flexDirection: "column", backgroundColor: palette.bar, flexShrink: 0, children: [_jsxs(Box, { width: columns, height: 1, backgroundColor: palette.bar, justifyContent: "space-between", flexShrink: 0, children: [_jsxs(Text, { backgroundColor: palette.bar, wrap: "truncate-end", children: [_jsx(Text, { backgroundColor: palette.accent, color: palette.onAccent, bold: true, children: ` ${mode.toUpperCase()} ` }), shown.map(([keys, action]) => (_jsxs(Text, { children: [_jsx(Text, { backgroundColor: palette.bar, children: " " }), _jsx(Text, { backgroundColor: palette.neutralSoft, color: palette.text, bold: true, children: ` ${keys} ` }), _jsx(Text, { backgroundColor: palette.bar, color: palette.muted, children: ` ${action}` })] }, keys + action)))] }), right ? (_jsx(Text, { backgroundColor: palette.bar, color: palette.faint, children: `${right} ` })) : null] }), _jsx(Box, { height: FOOTER_BRAND_GAP_ROWS, flexShrink: 0 }), _jsxs(Box, { width: columns, height: footerRows - 1 - FOOTER_BRAND_GAP_ROWS, paddingX: 1, backgroundColor: palette.bar, flexShrink: 0, flexDirection: inlineBrand ? 'row' : 'column', alignItems: inlineBrand ? 'center' : 'flex-start', justifyContent: "center", children: [_jsx(Logo, { cursorVisible: true }), _jsx(Box, { width: sloganWidth, marginLeft: inlineBrand ? 2 : 0, children: _jsx(Text, { backgroundColor: palette.bar, color: palette.muted, wrap: "wrap", children: APP_SLOGAN }) })] })] }));
+    return (_jsxs(Box, { width: columns, height: footerRows, flexDirection: "column", backgroundColor: palette.bar, flexShrink: 0, children: [_jsxs(Box, { width: columns, height: 1, backgroundColor: palette.bar, justifyContent: "space-between", flexShrink: 0, children: [_jsxs(Text, { backgroundColor: palette.bar, wrap: "truncate-end", children: [_jsx(Text, { backgroundColor: palette.accent, color: palette.onAccent, bold: true, children: ` ${mode.toUpperCase()} ` }), shown.map(([keys, action]) => (_jsxs(Text, { children: [_jsx(Text, { backgroundColor: palette.bar, children: " " }), _jsx(Text, { backgroundColor: palette.neutralSoft, color: palette.text, bold: true, children: ` ${keys} ` }), _jsx(Text, { backgroundColor: palette.bar, color: palette.muted, children: ` ${action}` })] }, keys + action)))] }), _jsxs(Box, { flexShrink: 0, children: [right ? (_jsx(Text, { backgroundColor: palette.bar, color: palette.faint, children: `${right} ` })) : null, mouse ? (_jsx(Clickable, { onClick: mouse.onToggle, active: mouse.active, children: _jsxs(Text, { backgroundColor: palette.bar, children: [_jsx(Text, { backgroundColor: palette.neutralSoft, color: palette.text, bold: true, children: ' M ' }), _jsx(Text, { backgroundColor: palette.bar, color: mouse.on ? palette.muted : palette.warning, children: mouseLabel(mouse.on) })] }) })) : null] })] }), _jsx(Box, { height: FOOTER_BRAND_GAP_ROWS, flexShrink: 0 }), _jsxs(Box, { width: columns, height: footerRows - 1 - FOOTER_BRAND_GAP_ROWS, paddingX: 1, backgroundColor: palette.bar, flexShrink: 0, flexDirection: inlineBrand ? 'row' : 'column', alignItems: inlineBrand ? 'center' : 'flex-start', justifyContent: "center", children: [_jsx(Logo, { cursorVisible: true }), _jsx(Box, { width: sloganWidth, marginLeft: inlineBrand ? 2 : 0, children: _jsx(Text, { backgroundColor: palette.bar, color: palette.muted, wrap: "wrap", children: APP_SLOGAN }) })] })] }));
 }

package/dist/ui/hooks/use-commands.js

@@ -1,6 +1,7 @@
 import { FILTER_LABELS, TASK_FILTERS } from '../../application/filters.js';
 import { useAppState } from '../app-state.js';
 import { useFlows } from './use-flows.js';
+import { useMouseToggle } from './use-mouse-toggle.js';
 /** The command palette: every major action, filterable by typing. */
 export function useCommandPalette(newTaskProjectId) {
     const { openOverlay, go, quit, services, session, notify, setHomeFilter } = useAppState();
@@ -10,6 +11,7 @@ export function useCommandPalette(newTaskProjectId) {
         go({ type: 'reset' });
     };
     const flows = useFlows();
+    const mouse = useMouseToggle();
     return () => {
         const commands = [
             { id: 'new-task', label: 'New task', key: 'n', run: () => openOverlay({ kind: 'new-task', projectId: newTaskProjectId }) },
@@ -40,6 +42,7 @@ export function useCommandPalette(newTaskProjectId) {
                         },
                     }]
                 : []),
+            { id: 'mouse', label: mouse.enabled ? 'Mouse off' : 'Mouse on', key: 'M', run: mouse.toggle },
             { id: 'help', label: 'Help', key: '?', run: () => go({ type: 'push', route: { name: 'help' } }) },
             { id: 'quit', label: 'Quit', key: 'q', run: quit },
         ];

package/dist/ui/hooks/use-mouse-toggle.js

@@ -0,0 +1,20 @@
+import { useAppState } from '../app-state.js';
+import { useMouseSwitch } from '../input/KeyProvider.js';
+/**
+ * Turns the mouse on or off now and remembers it on this machine. With the
+ * mouse off the terminal selects and copies text as usual; `M` brings it back.
+ */
+export function useMouseToggle() {
+    const { services, notify } = useAppState();
+    const mouse = useMouseSwitch();
+    const toggle = () => {
+        const next = !mouse.enabled;
+        mouse.set(next);
+        services.preferences.setMouse(next);
+        if (next)
+            notify('Mouse on', 'success');
+        else
+            notify('Mouse off', 'success', 'Press M to turn it back on.');
+    };
+    return { enabled: mouse.enabled, toggle };
+}

package/dist/ui/input/KeyProvider.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useApp, useInput, useStdout } from 'ink';
-import { createContext, useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { createContext, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { KeyDispatcher, Layer } from './dispatcher.js';
 import { MOUSE_OFF, MOUSE_ON, MouseDispatcher, parseMouse, rectOf } from './mouse.js';
 const InputContext = createContext(null);
@@ -9,7 +9,9 @@ const InputContext = createContext(null);
  * reports to the clickable regions. A mouse report never reaches a key handler.
  */
 export function KeyProvider({ children, mouse = false }) {
-    const [context] = useState(() => ({ keys: new KeyDispatcher(), mouse: new MouseDispatcher(), mouseEnabled: mouse }));
+    const [dispatchers] = useState(() => ({ keys: new KeyDispatcher(), mouse: new MouseDispatcher() }));
+    const [mouseEnabled, setMouseEnabled] = useState(mouse);
+    const context = useMemo(() => ({ ...dispatchers, mouseEnabled, setMouseEnabled }), [dispatchers, mouseEnabled]);
     const { stdout } = useStdout();
     useInput((input, key) => {
         const event = parseMouse(input);
@@ -18,8 +20,9 @@ export function KeyProvider({ children, mouse = false }) {
         else
             context.keys.dispatch(input, key);
     });
+    // Turning the mouse off hands selection and copy back to the terminal.
     useEffect(() => {
-        if (!mouse)
+        if (!mouseEnabled)
             return;
         stdout.write(MOUSE_ON);
         // Whatever way SOJA ends, the terminal must stop sending mouse reports.
@@ -29,9 +32,14 @@ export function KeyProvider({ children, mouse = false }) {
             off();
             process.off('exit', off);
         };
-    }, [mouse, stdout]);
+    }, [mouseEnabled, stdout]);
     return _jsx(InputContext.Provider, { value: context, children: children });
 }
+/** The mouse switch: whether it is on, and turning it on or off for this session. */
+export function useMouseSwitch() {
+    const { mouseEnabled, setMouseEnabled } = useInputContext();
+    return { enabled: mouseEnabled, set: setMouseEnabled };
+}
 function useInputContext() {
     const context = useContext(InputContext);
     if (!context)

package/dist/ui/screens/HelpScreen.js

@@ -72,6 +72,7 @@ const SECTIONS = [
             ['wheel', 'Scroll lists and chat'],
             ['click outside', 'Close a window'],
             ['shift+drag', 'Select text to copy'],
+            ['M', 'Mouse on / off (remembered)'],
         ],
     ],
     [

package/dist/ui/theme/theme.js

@@ -100,6 +100,7 @@ export const symbols = {
     check: '✓',
     cross: '✕',
     active: '●',
+    inactive: '○',
     rule: '─',
     comment: '›',
     ellipsis: '…',

package/docs/NPM_PUBLISH.md

@@ -20,15 +20,27 @@ Luego, en npmjs.com → `soja-cli` → **Settings → Trusted Publisher → GitH
 - Repository: `soja-cli`
 - Workflow filename: `publish.yml`
 - Environment: vacío
+- Permisos: **npm stage publish** (solo dejar versiones en espera, no publicarlas)
 
-Y en **Settings → Publishing access**, elige *Require two-factor authentication and disallow tokens*: a partir de ahí solo el workflow puede publicar.
+Y en **Settings → Publishing access**, elige *Require two-factor authentication and disallow bypass 2fa tokens*.
+
+Con eso, ni el workflow ni un token robado pueden publicar solos: el workflow deja la versión **en espera** (*staged publishing*) y solo sale a npm cuando la cuenta propietaria la aprueba con 2FA.
 
 ## Versiones siguientes (automático)
 
 Sube la versión en `package.json` y `package-lock.json`, mueve el changelog y haz commit `release: vX.Y.Z` en `main` (por PR). Al subir el tag `vX.Y.Z`:
 
 - `release.yml` crea el release de GitHub con el paquete adjunto;
-- `publish.yml` valida (lint, tests, build, que el tag coincida con la versión), empaqueta sin *source maps* en un job sin permisos de publicación y publica ese mismo archivo en otro job con OIDC, sin tokens de larga duración y con *provenance* (npm registra desde qué commit y workflow se construyó). Si la versión ya está en npm, no hace nada.
+- `publish.yml` valida (lint, tests, build, que el tag coincida con la versión), empaqueta sin *source maps* en un job sin permisos de publicación y deja ese mismo archivo en espera en npm desde otro job, con OIDC (sin tokens de larga duración) y *provenance* (npm registra desde qué commit y workflow se construyó). Si la versión ya está en npm, no hace nada.
+
+Después apruébala tú (necesita npm ≥ 11.17 y tu 2FA):
+
+```bash
+npm stage list soja-cli          # muestra la versión en espera y su id
+npm stage approve <stage-id>     # la publica
+```
+
+El resumen del run de `publish.yml` en GitHub recuerda estos comandos. Si algo no cuadra, `npm stage reject <stage-id>` la descarta.
 
 ## Qué implica que sea público
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soja-cli",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Software Operations & Job Assistant",
   "author": "Enmauel.biz",
   "license": "SEE LICENSE IN LICENSE",