m3triq 0.2.8 → 0.2.9

package/dist/cli.js

@@ -24,7 +24,7 @@ const program = new Command();
 program
     .name('m3t')
     .description('M3TRIQ — protein-ligand analysis from the terminal')
-    .version('0.2.8')
+    .version('0.2.9')
     .option('--json', 'Output as JSON (machine-readable)')
     .hook('preAction', (thisCommand) => {
     const opts = thisCommand.optsWithGlobals();

package/dist/commands/jobs.js

@@ -61,29 +61,63 @@ export function registerJobCommands(program) {
         .command('job')
         .argument('<id>', 'Job ID (full or short 8-char)')
         .description('Get job status and results')
-        .action(async (id) => {
+        .option('-w, --watch', 'Poll until the job completes (or fails), redrawing in place every 5s')
+        .option('--interval <sec>', 'Poll interval in seconds when --watch (default 5)', (v) => parseInt(v, 10), 5)
+        .action(async (id, opts) => {
         const project = requireProject();
         const client = createClient();
         const fullId = await resolveJobId(client, project.id, id);
-        const job = await client.getJob(fullId);
         const consoleUrl = getConsoleUrl();
-        const url = jobUrl(consoleUrl, project.id, job.id);
-        const lines = [
-            `Job:      ${job.title || job.id}`,
-            `Type:     ${job.job_type}`,
-            `Status:   ${job.status}`,
-            `Progress: ${job.progress_percentage}%`,
-        ];
-        if (job.current_step)
-            lines.push(`Step:     ${job.current_step}`);
-        if (job.completed_at)
-            lines.push(`Done:     ${job.completed_at}`);
-        if (job.result_data && job.status === 'completed') {
-            const summary = summarizeResults(job.job_type, job.result_data);
-            if (summary)
-                lines.push(summary);
+        const renderJob = (job) => {
+            const url = jobUrl(consoleUrl, project.id, job.id);
+            const lines = [
+                `Job:      ${job.title || job.id}`,
+                `Type:     ${job.job_type}`,
+                `Status:   ${job.status}`,
+                `Progress: ${job.progress_percentage}%`,
+            ];
+            if (job.current_step)
+                lines.push(`Step:     ${job.current_step}`);
+            if (job.completed_at)
+                lines.push(`Done:     ${job.completed_at}`);
+            if (job.result_data && job.status === 'completed') {
+                const summary = summarizeResults(job.job_type, job.result_data);
+                if (summary)
+                    lines.push(summary);
+            }
+            lines.push(`View:     ${url}`);
+            return lines.join('\n');
+        };
+        // Single snapshot (default) — matches previous behavior
+        if (!opts.watch) {
+            const job = await client.getJob(fullId);
+            output(job, renderJob(job));
+            return;
+        }
+        // Watch mode: redraw in place until terminal status. Falls back to
+        // append-only output when stdout isn't a TTY (e.g. piped to a file).
+        const terminalStatuses = new Set(['completed', 'failed', 'cancelled']);
+        const intervalMs = Math.max(2, opts.interval) * 1000;
+        const isTty = !!process.stdout.isTTY;
+        let lastLineCount = 0;
+        // Disable JSON mode in watch — we're emitting frames, not a single result.
+        while (true) {
+            const job = await client.getJob(fullId);
+            const frame = renderJob(job);
+            if (isTty) {
+                // Move cursor up + clear the previous render before printing the new one.
+                if (lastLineCount > 0) {
+                    process.stdout.write(`\x1b[${lastLineCount}A\x1b[0J`);
+                }
+                process.stdout.write(frame + '\n');
+                lastLineCount = frame.split('\n').length;
+            }
+            else {
+                process.stdout.write(`---\n${frame}\n`);
+            }
+            if (terminalStatuses.has(job.status))
+                return;
+            await new Promise((r) => setTimeout(r, intervalMs));
         }
-        lines.push(`View:     ${url}`);
-        output(job, lines.join('\n'));
     });
 }

package/dist/config.d.ts

@@ -16,16 +16,6 @@ export declare function saveConfig(config: M3triqConfig): void;
 export declare function loadLocalProject(): LocalProjectConfig | null;
 /** Save .m3triq in the current working directory */
 export declare function saveLocalProject(projectId: string, projectName?: string): void;
-/**
- * Resolution order for project:
- *   1. Local .m3triq (cwd or parent)
- *   2. Global ~/.m3triq/config.json
- *
- * Resolution order for api_key/urls:
- *   1. Environment variables
- *   2. Global config
- *   3. Defaults
- */
 export declare function getEffectiveConfig(): M3triqConfig;
 export declare function requireApiKey(): string;
 export declare function requireProject(): {

package/dist/config.js

@@ -70,6 +70,18 @@ export function saveLocalProject(projectId, projectName) {
  *   2. Global config
  *   3. Defaults
  */
+// Stale console URLs that earlier CLI versions wrote to user configs. Silently
+// upgrade these to the current default so users see correct links without
+// having to manually re-run `m3t config --console ...`.
+const STALE_CONSOLE_URLS = new Set([
+    'https://app.m3triq.com',
+    'http://app.m3triq.com',
+]);
+function migrateConsoleUrl(fromFile) {
+    if (!fromFile)
+        return undefined;
+    return STALE_CONSOLE_URLS.has(fromFile) ? undefined : fromFile;
+}
 export function getEffectiveConfig() {
     const file = loadConfig();
     const local = loadLocalProject();
@@ -77,7 +89,7 @@ export function getEffectiveConfig() {
         api_key: process.env.M3TRIQ_API_KEY || file.api_key,
         api_url: process.env.M3TRIQ_API_URL || file.api_url || 'https://server.m3triq.com',
         agents_url: process.env.M3TRIQ_AGENTS_URL || file.agents_url || 'https://agents.m3triq.com',
-        console_url: process.env.M3TRIQ_CONSOLE_URL || file.console_url || 'https://console.m3triq.com',
+        console_url: process.env.M3TRIQ_CONSOLE_URL || migrateConsoleUrl(file.console_url) || 'https://console.m3triq.com',
         // Local project takes precedence over global
         active_project: local?.project_id || file.active_project,
         active_project_name: local?.project_name || file.active_project_name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "m3triq",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "M3TRIQ \u2014 protein-ligand analysis from the terminal",
   "type": "module",
   "bin": {