mindvest-atlas 0.6.1 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mindvest-atlas",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Atlas CLI \u2014 OAuth login, tool calls, and live alert/flow streaming for the Atlas trading API",
   "type": "module",
   "bin": {

package/src/commands/remote-control.js

@@ -15,8 +15,9 @@ import { requestJson } from '../api/client.js';
 import { runStream } from '../util/stream-loop.js';
 import { color, eprintln } from '../util/ui.js';
 import {
-  DEFAULT_TIMEOUT_MS, computerName, jobEnv, listJobFiles, listRuns, machineId, osLabel,
-  readJobFile, staleness, summarize, tail, workspace, workspaceRoot,
+  DEFAULT_TIMEOUT_MS, claimRun, computerName, jobEnv, listJobFiles, listRuns, machineId,
+  osLabel, readJobFile, releaseRun, staleness, summarize, tail, workspace, workspaceRoot,
+  writeHelpers,
 } from '../remote-control.js';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -121,6 +122,17 @@ async function runJob(job, root, timeoutMs) {
     return report(job, 'not_built', started, Date.now());
   }
 
+  // ONE RUN PER PROJECT. A schedule firing again mid-run would race two copies
+  // of the same script over one folder, one .env and one broker account.
+  if (!claimRun(dir, name)) {
+    eprintln(color.yellow(`· ${name} — already running, left alone`));
+    return undefined;
+  }
+
+  // Refreshed every run, so a job always has the supported way to reach a
+  // secret and never a reason to open .env itself.
+  writeHelpers(dir);
+
   eprintln(color.dim(`▶ ${name}`));
   const env = {
     ...process.env,
@@ -137,17 +149,20 @@ async function runJob(job, root, timeoutMs) {
     eprintln(color.red(`✗ ${name} — timed out`));
     writeLog(dir, job, 'failed', started, finished,
       `Stopped after ${Math.round(timeoutMs / 1000)}s. The script did not finish.\n${tail(r.out) || ''}`);
+    releaseRun(dir);
     return report(job, 'failed', started, finished);
   }
   if (r.error) {
     eprintln(color.red(`✗ ${name} — ${r.error}`));
     writeLog(dir, job, 'failed', started, finished, `${r.error}\n${tail(r.out) || ''}`);
+    releaseRun(dir);
     return report(job, 'failed', started, finished);
   }
   const ok = r.code === 0;
   eprintln((ok ? color.green('✓ ') : color.red('✗ ')) + name
     + color.dim(` (${((finished - started) / 1000).toFixed(1)}s)`));
   writeLog(dir, job, ok ? 'completed' : 'failed', started, finished, tail(r.out));
+  releaseRun(dir);
   return report(job, ok ? 'completed' : 'failed', started, finished);
 }
 

package/src/config.js

@@ -2,7 +2,7 @@
 import path from 'node:path';
 import os from 'node:os';
 
-export const VERSION = '0.6.1';
+export const VERSION = '0.6.3';
 export const DEFAULT_BASE_URL = 'https://atlasmcp.finmanagerai.com';
 export const DEFAULT_SCOPE = 'atlas broker';
 export const CLIENT_NAME = 'Atlas CLI';

package/src/remote-control.js

@@ -168,6 +168,70 @@ export function readEnvFile(file) {
  * Shared first so a key is typed once; the job's own last so a job that wants
  * its own value gets it. Neither is required.
  */
+/**
+ * Written into every job folder before it runs, in both languages.
+ *
+ * The job imports this instead of opening .env — so the script the model writes
+ * has no reason to touch the file, and a model debugging that script has nothing
+ * to learn by trying. Regenerated on every run, so editing or deleting it
+ * changes nothing.
+ */
+export function writeHelpers(dir) {
+  const py = `"""Secrets for this job. Written by Atlas — edits are overwritten.
+
+Values come from the environment Atlas set up before starting this script. Do
+NOT open .env: this module is the supported way to reach a secret, and the file
+itself is not something a script or a model needs to read.
+"""
+import os
+import sys
+
+
+def secret(name, default=None):
+    """The value of one secret, for USE — never for printing or logging."""
+    return os.environ.get(name, default)
+
+
+def has_secret(name):
+    """Whether a secret has been filled in. True/False only, never the value."""
+    return bool(os.environ.get(name))
+
+
+def require(*names):
+    """Stop cleanly when a secret has not been filled in yet."""
+    missing = [n for n in names if not os.environ.get(n)]
+    if missing:
+        print("Missing: %s. Add the value in Atlas Remote Control, then run again."
+              % ", ".join(missing))
+        sys.exit(2)
+`;
+  const js = `// Secrets for this job. Written by Atlas — edits are overwritten.
+//
+// Values come from the environment Atlas set up before starting this script. Do
+// NOT open .env: this module is the supported way to reach a secret, and the
+// file itself is not something a script or a model needs to read.
+
+/** The value of one secret, for USE — never for printing or logging. */
+export const secret = (name, fallback) => process.env[name] ?? fallback;
+
+/** Whether a secret has been filled in. True/false only, never the value. */
+export const hasSecret = (name) => Boolean(process.env[name]);
+
+/** Stop cleanly when a secret has not been filled in yet. */
+export function require_(...names) {
+  const missing = names.filter((n) => !process.env[n]);
+  if (missing.length) {
+    console.log(\`Missing: \${missing.join(", ")}. Add the value in Atlas Remote Control, then run again.\`);
+    process.exit(2);
+  }
+}
+`;
+  try {
+    fs.writeFileSync(path.join(dir, 'atlas_env.py'), py);
+    fs.writeFileSync(path.join(dir, 'atlas_env.js'), js);
+  } catch { /* a helper is a courtesy, never a failure */ }
+}
+
 export function jobEnv(dir, root) {
   return { ...readEnvFile(path.join(workspaceRoot(root), '.env')), ...readEnvFile(path.join(dir, '.env')) };
 }
@@ -307,6 +371,43 @@ export function readJobFile(job, rel, root) {
  * the filename (when, and how it ended) and the log's own second line (how
  * long), which is why the writer stamps both.
  */
+export const RUNNING_MARKER = '.running';
+
+export const runningMarker = (dir) => path.join(dir, 'runs', RUNNING_MARKER);
+
+/**
+ * Take a project's single run slot, or say who already has it.
+ *
+ * ONE RUN PER PROJECT. A job that fires again while its last run is still going
+ * would have two copies of the same script racing over the same folder, the
+ * same .env and the same broker — so the second one does not start. The marker
+ * is a file rather than memory so it survives the runner restarting mid-job and
+ * is visible to anyone looking at the folder.
+ */
+export function claimRun(dir, name) {
+  const m = runningMarker(dir);
+  try {
+    fs.mkdirSync(path.dirname(m), { recursive: true });
+    // Exclusive create: two runners on one folder cannot both win.
+    fs.writeFileSync(m, `${Date.now() / 1000}\n${name || ''}\n`, { flag: 'wx' });
+    return true;
+  } catch (err) {
+    if (err.code !== 'EEXIST') return true; // cannot write a marker: better to run than never
+    let started = 0;
+    try { started = parseFloat(fs.readFileSync(m, 'utf8').split('\n')[0]) || 0; } catch { started = 0; }
+    // A marker left behind by a crash must not wedge a project forever.
+    if (started && Date.now() / 1000 - started > 24 * 3600) {
+      releaseRun(dir);
+      return claimRun(dir, name);
+    }
+    return false;
+  }
+}
+
+export function releaseRun(dir) {
+  try { fs.unlinkSync(runningMarker(dir)); } catch { /* already gone */ }
+}
+
 export function listRuns(root, limit = 50) {
   const base = path.join(workspaceRoot(root), SCRIPTS_DIR);
   const runs = [];
@@ -315,6 +416,19 @@ export function listRuns(root, limit = 50) {
     jobs = fs.readdirSync(base, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
   } catch { return runs; }
   for (const job of jobs) {
+    // A project running right now has no log yet — it is the most important row
+    // on the page and would otherwise be invisible until it finished.
+    const m = runningMarker(path.join(base, job));
+    if (fs.existsSync(m)) {
+      let started = Date.now() / 1000;
+      let nm = job;
+      try {
+        const [a, b] = fs.readFileSync(m, 'utf8').split('\n');
+        started = parseFloat(a) || started;
+        if (b) nm = b;
+      } catch { /* mid-write */ }
+      runs.push({ job, name: nm, status: 'running', started_at: started, duration_s: null, log: '' });
+    }
     let files = [];
     try {
       files = fs.readdirSync(path.join(base, job, 'runs')).filter((f) => f.endsWith('.log')).sort().reverse();