@turns/dev 0.0.1 → 0.0.2

package/README.md

@@ -14,8 +14,9 @@ npm install --global @turns/dev
 ## Commands
 
 ```text
-turns                         upload sessions for the current directory once
-turns upload [directory]      watch one directory
+turns                         watch and stream sessions for the current directory
+turns upload [directory]      watch and stream sessions for one directory
+turns --once [directory]      upload that directory's sessions once and exit
 turns install                 install the all-directory user daemon
 turns status                  report daemon state
 turns uninstall               remove the daemon
@@ -23,6 +24,20 @@ turns login                   replace saved credentials through the browser
 turns logout                  remove saved credentials
 ```
 
+`turns` and `turns upload DIRECTORY` are the daemon scoped to one directory
+tree: they keep watching, stream live rows as the harness writes them, and
+serve prompts queued from the web until interrupted. That directory is the
+allowlist, so sessions in its subdirectories are followed and agent launches
+cannot start outside it. Run `turns install` instead for an unattended
+all-directory daemon; while that daemon is active a foreground run declines to
+start a second uploader, since both would write the same upload-cursor file.
+
+`--once` sweeps the same directory tree and exits as soon as its sessions are
+current, for scripts and CI steps that need an upload to finish rather than a
+process to stay resident. A run narrowed to a directory — watching or `--once` —
+never prunes saved upload cursors, so it cannot make the sessions it filtered
+out replay from their first byte the next time the daemon starts.
+
 The server is selected with `--server URL` or `TURNS_ORIGIN`. Its normalized
 origin is saved in `~/.config/turns/credentials.json` and reused by later
 invocations and daemon starts. On Linux the other persistent files are:
@@ -42,7 +57,7 @@ Rows are scanned on their way out for substrings that look like file paths —
 filesystem confirms is recorded on the session's own log as a resolution: the
 substring, the absolute path, the size, and whether the contents were sent.
 Paths resolve against the session's working directory and are canonicalised
-before the `--allow-directory` prefixes are enforced, so a symlink out of an
+before the `--directory` prefixes are enforced, so a symlink out of an
 allowed tree is not a way to read the disk.
 
 Only images under 10 MB are uploaded, to `PUT /api/file/{machine}/{path}`. Everything else is recorded as a name, so
@@ -59,16 +74,16 @@ straight to R2, so neither process retains the complete file in memory.
 The systemd unit uses `KillMode=process`: restarting the uploader leaves its
 detached agent-anchor processes running so in-flight harness turns continue.
 For a foreground daemon restricted to one or more directory trees, repeat
-`--allow-directory`. Both transcript discovery and agent launches enforce the
+`--directory`. Both transcript discovery and agent launches enforce the
 canonical prefix, including protection against symlinks that escape it:
 
 ```sh
-turns daemon run --server https://turns.example --allow-directory /srv/agents
+turns daemon run --server https://turns.example --directory /srv/agents
 ```
 
 Against local Wrangler development, use the configured `DEV_USER` directly:
 
 ```sh
 turns daemon run --server http://127.0.0.1:8787 \
-  --dev-user antimatter15 --allow-directory /tmp/turns-driver-workspaces
+  --dev-user antimatter15 --directory /tmp/turns-driver-workspaces
 ```

package/dist/index.js

@@ -62,8 +62,9 @@ function help() {
     return `Turns ${pkg.version}
 
 Usage:
-  turns                         Upload sessions for the current directory once
-  turns upload [directory]      Watch sessions belonging to one directory
+  turns                         Watch and stream sessions for the current directory
+  turns upload [directory]      Watch and stream sessions for one directory
+  turns --once [directory]      Upload the directory's sessions once and exit
   turns install                 Install and start the all-directory daemon
   turns status                  Show daemon status
   turns uninstall               Stop and uninstall the background daemon
@@ -73,7 +74,8 @@ Usage:
 
 Options:
   --server URL                  Use a Turns server (saved with credentials)
-  --allow-directory PATH        Restrict daemon uploads/launches to this prefix (repeatable)
+  --once                        Upload once and exit instead of watching
+  --directory PATH              Restrict daemon uploads/launches to this prefix (repeatable)
   --dev-user LOGIN              Authenticate to a local Wrangler DEV_USER server
   --no-browser                  Print the authentication URL without opening it
 
@@ -86,6 +88,7 @@ function parseGlobalArguments(argv) {
     const remaining = [];
     let origin = process.env.TURNS_ORIGIN || process.env.TURNS_SERVER || '';
     let devUser = '';
+    let once = false;
     const allowedDirectories = [];
     for (let index = 0; index < argv.length; index += 1) {
         const argument = argv[index];
@@ -95,7 +98,7 @@ function parseGlobalArguments(argv) {
                 throw new Error(`${argument} requires a URL.`);
             origin = value;
         }
-        else if (argument === '--allow-directory') {
+        else if (argument === '--directory') {
             const value = argv[++index];
             if (!value)
                 throw new Error(`${argument} requires a path.`);
@@ -107,6 +110,9 @@ function parseGlobalArguments(argv) {
                 throw new Error(`${argument} requires a login.`);
             devUser = value.trim().toLowerCase();
         }
+        else if (argument === '--once') {
+            once = true;
+        }
         else if (argument === '--no-browser') {
             process.env.TURNS_NO_BROWSER = '1';
         }
@@ -114,7 +120,24 @@ function parseGlobalArguments(argv) {
             remaining.push(argument);
         }
     }
-    return { argv: remaining, origin: origin || undefined, devUser, allowedDirectories };
+    return { argv: remaining, origin: origin || undefined, devUser, once, allowedDirectories };
+}
+/** A foreground run is the daemon scoped to one directory: it keeps watching,
+ * streams live rows, and serves queued prompts. The directory becomes the
+ * allowlist rather than an upload filter, so sessions in its subdirectories are
+ * followed too and launches arriving from the server cannot escape it. */
+export function scopedWatchOptions(directory, { once = false } = {}) {
+    const resolved = path.resolve(directory || process.cwd());
+    let allowedDirectories;
+    try {
+        allowedDirectories = normalizeAllowedDirectories([resolved]);
+    }
+    catch {
+        throw new Error(`Not a directory: ${resolved}`);
+    }
+    // `--once` keeps the same tree, so a single sweep covers subdirectories the
+    // way the watch does; it only stops the process from staying resident.
+    return { directory: resolved, watch: !once, allowedDirectories };
 }
 function credentialProvider(initial, { paths, interactive }) {
     let credentials = initial;
@@ -166,14 +189,18 @@ function credentialProvider(initial, { paths, interactive }) {
  * @param {object} credentials
  * @param {object} [options]
  * @param {import('./auth.ts').AuthPaths} [options.paths]
- * @param {string} [options.directory]
  * @param {boolean} [options.watch]
  * @param {boolean} [options.all]
  * @param {boolean} [options.interactive]
  * @param {string} [options.devUser]
  * @param {string[]} [options.allowedDirectories]
  */
-async function runUpload(credentials, { paths, directory = '', watch = false, all = false, interactive = true, devUser = '', allowedDirectories = [], } = {}) {
+async function runUpload(credentials, { paths, watch = false, all = false, interactive = true, devUser = '', allowedDirectories = [], } = {}) {
+    if (!all && !allowedDirectories.length) {
+        // Every caller either sweeps all directories or names the prefixes it may
+        // touch. An unscoped run would also accept launches anywhere on the machine.
+        throw new Error('runUpload requires either all directories or an explicit allowlist.');
+    }
     migrateLegacyUploaderState(paths);
     const provider = devUser ? null : credentialProvider(credentials, { paths, interactive });
     const { runUploader } = await import("./upload-sessions.js");
@@ -186,9 +213,9 @@ async function runUpload(credentials, { paths, directory = '', watch = false, al
         '--machine-id-file',
         paths.machineId,
         ...(devUser ? ['--dev-user', devUser] : []),
-        ...allowedDirectories.flatMap((directory) => ['--allow-directory', directory]),
+        ...allowedDirectories.flatMap((directory) => ['--directory', directory]),
         ...(watch ? ['--watch'] : []),
-        ...(all ? ['--all'] : allowedDirectories.length ? [] : ['--directory', path.resolve(directory || process.cwd())]),
+        ...(all ? ['--all'] : []),
     ];
     try {
         await runUploader(arguments_, { credentialProvider: provider });
@@ -242,6 +269,8 @@ async function main(rawArguments = process.argv.slice(2)) {
         if (argv[1] !== 'run')
             throw new Error(`Unknown daemon command: ${argv[1] || ''}\n\n${help()}`);
         const allowedDirectories = normalizeAllowedDirectories(parsed.allowedDirectories);
+        if (parsed.once)
+            throw new Error('--once cannot be combined with `turns daemon run`.');
         if (parsed.devUser && !parsed.origin)
             throw new Error('--dev-user requires an explicit --server URL.');
         let credentials;
@@ -266,24 +295,31 @@ async function main(rawArguments = process.argv.slice(2)) {
         return;
     }
     if (parsed.devUser || parsed.allowedDirectories.length) {
-        throw new Error('--dev-user and --allow-directory are supported only by `turns daemon run`.');
+        throw new Error('--dev-user and --directory are supported only by `turns daemon run`.');
     }
     if (command && command !== 'upload')
         throw new Error(`Unknown command: ${command}\n\n${help()}`);
     const runningDaemon = daemonStatus();
+    // Including `--once`: the daemon holds the same upload-cursor file, and a
+    // second writer would persist its own load-time copy over the daemon's
+    // concurrent progress. The daemon already keeps this directory current.
     if (runningDaemon.active) {
         process.stdout.write('The Turns daemon is already syncing this directory as part of the all-directory watch.\n');
         return;
     }
     await migrateLegacyCredentials(paths, parsed.origin);
     const credentials = await authenticate({ origin: parsed.origin, paths });
-    const selectedDirectory = path.resolve(command === 'upload' ? argv[1] || process.cwd() : process.cwd());
-    process.stdout.write(`${command === 'upload' ? 'Watching' : 'Uploading'} sessions in ${selectedDirectory} as @${credentials.user.login}.\n`);
+    const selected = scopedWatchOptions(command === 'upload' ? argv[1] || process.cwd() : process.cwd(), {
+        once: parsed.once,
+    });
+    process.stdout.write(selected.watch
+        ? `Watching sessions in ${selected.directory} as @${credentials.user.login}. Press Ctrl-C to stop.\n`
+        : `Uploading sessions in ${selected.directory} as @${credentials.user.login}.\n`);
     await runUpload(credentials, {
         paths,
-        directory: selectedDirectory,
-        watch: command === 'upload',
+        watch: selected.watch,
         interactive: true,
+        allowedDirectories: selected.allowedDirectories,
     });
 }
 export { credentialProvider, help, main, parseGlobalArguments, runUpload };

package/dist/upload-sessions.js

@@ -149,7 +149,7 @@ function argumentsFrom(argv, { allowMissingToken = false } = {}) {
         rewriteSession: '',
         nativeStateFile: process.env.TURNS_NATIVE_STATE_FILE || path.join(HERE, '.native-upload-state.json'),
         machineIdFile: process.env.TURNS_MACHINE_ID_FILE || path.join(HERE, '.machine-id'),
-        directory: '',
+        onlyDirectory: '',
         all: false,
         devUser: '',
         allowedDirectories: [],
@@ -180,13 +180,13 @@ function argumentsFrom(argv, { allowMissingToken = false } = {}) {
             options.nativeStateFile = path.resolve(next());
         else if (argument === '--machine-id-file')
             options.machineIdFile = path.resolve(next());
-        else if (argument === '--directory')
-            options.directory = path.resolve(next());
+        else if (argument === '--only-directory')
+            options.onlyDirectory = path.resolve(next());
         else if (argument === '--all')
             options.all = true;
         else if (argument === '--dev-user')
             options.devUser = next().trim().toLowerCase();
-        else if (argument === '--allow-directory')
+        else if (argument === '--directory')
             options.allowedDirectories.push(next());
         else if (argument === '--watch')
             options.watch = true;
@@ -198,9 +198,9 @@ function argumentsFrom(argv, { allowMissingToken = false } = {}) {
                 `  --dry-run            inventory native sessions without uploading\n` +
                 `  --runs PATH          capture root (default: ${DEFAULT_RUNS})\n` +
                 `  --only TEXT          upload paths containing TEXT\n` +
-                `  --directory PATH     upload sessions whose working directory is PATH\n` +
+                `  --directory PATH     upload/launch only inside directory prefix PATH (repeatable)\n` +
+                `  --only-directory PATH upload only sessions whose working directory is exactly PATH\n` +
                 `  --all                upload sessions across all working directories\n` +
-                `  --allow-directory P  upload/launch only inside directory prefix P (repeatable)\n` +
                 `  --dev-user LOGIN     authenticate as a local Wrangler DEV_USER uploader\n` +
                 `  --url WS_URL         websocket endpoint\n` +
                 `  --token TOKEN        internal/test bearer token override\n` +
@@ -214,10 +214,10 @@ function argumentsFrom(argv, { allowMissingToken = false } = {}) {
     if (options.rewriteSession && !options.native) {
         throw new Error('--rewrite-session requires --native.');
     }
-    if (options.directory && options.all)
-        throw new Error('--directory cannot be combined with --all.');
-    if (options.allowedDirectories.length && (options.directory || options.all)) {
-        throw new Error('--allow-directory cannot be combined with --directory or --all.');
+    if (options.onlyDirectory && options.all)
+        throw new Error('--only-directory cannot be combined with --all.');
+    if (options.allowedDirectories.length && (options.onlyDirectory || options.all)) {
+        throw new Error('--directory cannot be combined with --only-directory or --all.');
     }
     options.allowedDirectories = normalizeAllowedDirectories(options.allowedDirectories);
     if (!options.dryRun && !options.token && !options.devUser && !allowMissingToken) {
@@ -1245,7 +1245,7 @@ export function watchNativeSessionDirectories({ roots, shallowRoots = [], files
     };
 }
 const nativeWorkingDirectoryCache = new Map();
-export async function filterNativeSessionsByDirectory(sessions, directory, resolveWorkingDirectory = nativeDescriptorWorkingDirectory) {
+export async function filterNativeSessionsByOnlyDirectory(sessions, directory, resolveWorkingDirectory = nativeDescriptorWorkingDirectory) {
     if (!directory)
         return sessions;
     const selected = path.resolve(directory);
@@ -1263,7 +1263,7 @@ export async function filterNativeSessionsByDirectory(sessions, directory, resol
     }
     return scoped;
 }
-export async function filterNativeSessionsByAllowedDirectories(sessions, allowedDirectories, resolveWorkingDirectory = nativeDescriptorWorkingDirectory) {
+export async function filterNativeSessionsByDirectories(sessions, allowedDirectories, resolveWorkingDirectory = nativeDescriptorWorkingDirectory) {
     if (!allowedDirectories?.length)
         return sessions;
     const scoped = [];
@@ -1280,10 +1280,18 @@ export async function filterNativeSessionsByAllowedDirectories(sessions, allowed
     }
     return scoped;
 }
+/** Whether this run's inventory speaks for the whole machine. A run narrowed by
+ * `--only`, `--rewrite-session`, `--only-directory`, or `--directory` sees a
+ * subset, so it must not prune upload cursors for the sessions it filtered out:
+ * the next unscoped run would find no cursor and replay those transcripts from
+ * their first byte. */
+export function inventoryIsAuthoritative(options) {
+    return !(options.only || options.rewriteSession || options.onlyDirectory || options.allowedDirectories?.length);
+}
 async function nativeInventory(options, machine) {
     let sessions = linkNativeSessionParents(machine, discoverLocalSessions(options.rewriteSession ? '' : options.only));
-    sessions = await filterNativeSessionsByDirectory(sessions, options.directory);
-    sessions = await filterNativeSessionsByAllowedDirectories(sessions, options.allowedDirectories);
+    sessions = await filterNativeSessionsByOnlyDirectory(sessions, options.onlyDirectory);
+    sessions = await filterNativeSessionsByDirectories(sessions, options.allowedDirectories);
     if (!options.rewriteSession)
         return sessions;
     const exact = sessions.filter((descriptor) => stableNativeSessionId(machine, descriptor.harness, descriptor.sourcePath) === options.rewriteSession);
@@ -1399,6 +1407,7 @@ async function uploadNative(options, machine, redactor = DEFAULT_REDACTOR) {
     const livePriority = new Set();
     const tombstoned = new Set();
     let nativeMonitor = null;
+    const authoritativeInventory = inventoryIsAuthoritative(options);
     const rememberInventory = (sessions, retainState = false, forceMetadataDirectories = new Set()) => {
         const previousFingerprints = new Map(fingerprints);
         descriptorBySession.clear();
@@ -1459,7 +1468,7 @@ async function uploadNative(options, machine, redactor = DEFAULT_REDACTOR) {
                 redactionStarted.add(sessionId);
             }
         }
-        if (retainState && !options.only && !options.rewriteSession)
+        if (retainState && authoritativeInventory)
             state.retain(descriptorBySession.keys());
         descriptorRegistry.sessions = sessions;
         nativeMonitor?.addFiles(sessions.map((descriptor) => descriptor.file));
@@ -1725,7 +1734,7 @@ async function uploadNative(options, machine, redactor = DEFAULT_REDACTOR) {
                 rememberInventory(sessions);
                 const unsettled = changedSessions();
                 if (unsettled.length) {
-                    process.stderr.write(`${unsettled.length} native sessions kept changing; use --watch to follow them continuously.\n`);
+                    process.stderr.write(`${unsettled.length} native sessions kept changing; run \`turns\` without --once to follow them continuously.\n`);
                 }
                 break;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turns/dev",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Upload local AI agent sessions to turns.dev",
   "license": "MIT",
   "type": "module",