@tuned-tensor/cli 0.13.1-beta.3 → 0.13.1-beta.4

package/dist/index.js

@@ -1,15 +1,22 @@
 #!/usr/bin/env node
 import {
+  DEFAULT_ARTIFACT_ROOT,
+  DEFAULT_FOUNDATION_RUNS_DIR,
   TRAINING_MODELS,
   assertFoundationSpecReady,
   assertLocalRunInputReady,
   buildFoundationPythonCommand,
+  defaultStoreRoot,
+  expandUserPath,
+  getAgentConfigDir,
+  getConfigDir,
+  hardenExistingLocalStore,
   loadLocalRunInput,
   loadLocalRunnerConfig,
   runLocalPipeline,
   runLoggedProcess,
   withFoundationPythonEnvironment
-} from "./chunk-2P2RL23O.js";
+} from "./chunk-7VIUHQBI.js";
 
 // src/cli.ts
 import { spawn as spawn2 } from "child_process";
@@ -591,7 +598,6 @@ import {
   readFileSync,
   writeFileSync
 } from "fs";
-import { homedir } from "os";
 import { join as join2 } from "path";
 var AGENT_THINKING_LEVELS = [
   "off",
@@ -602,16 +608,7 @@ var AGENT_THINKING_LEVELS = [
   "xhigh",
   "max"
 ];
-var CONFIG_DIR_NAME = "tuned-tensor";
 var CONFIG_FILE_NAME = "config.json";
-function getConfigDir() {
-  const xdg = process.env.XDG_CONFIG_HOME;
-  const base = xdg || join2(homedir(), ".config");
-  return join2(base, CONFIG_DIR_NAME);
-}
-function getAgentConfigDir() {
-  return join2(getConfigDir(), "agent");
-}
 function getConfigPath() {
   return join2(getConfigDir(), CONFIG_FILE_NAME);
 }
@@ -1073,10 +1070,10 @@ var TRAINING_SOURCE_FILES = {
     common: "training/foundation/src/common.py"
   },
   adapter: {
-    train: "training/local-runner/src/train.py",
-    data: "training/local-runner/src/sft_data.py",
-    model_contract: "training/local-runner/src/model_contract.py",
-    evaluate: "training/local-runner/src/evaluate.py"
+    train: "training/adapter/src/train.py",
+    data: "training/adapter/src/sft_data.py",
+    model_contract: "training/adapter/src/model_contract.py",
+    evaluate: "training/adapter/src/evaluate.py"
   }
 };
 var UUID_PATTERN = "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-8][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$";
@@ -2009,8 +2006,8 @@ import { stripVTControlCharacters as stripVTControlCharacters3 } from "util";
 // src/shell.ts
 import chalk from "chalk";
 import { stat as stat3 } from "fs/promises";
-import { homedir as homedir3 } from "os";
-import { isAbsolute as isAbsolute2, resolve as resolve2 } from "path";
+import { homedir } from "os";
+import { isAbsolute, resolve as resolve2 } from "path";
 import { createInterface as createInterface2 } from "readline";
 import { stripVTControlCharacters } from "util";
 
@@ -2109,8 +2106,7 @@ function createCommandCompleter(getMode = () => "local") {
 
 // src/shell-context.ts
 import { readFile as readFile2, readdir as readdir2, stat as stat2 } from "fs/promises";
-import { homedir as homedir2 } from "os";
-import { basename, dirname as dirname2, isAbsolute, join as join5, resolve } from "path";
+import { basename, dirname as dirname2, join as join5, resolve } from "path";
 async function readJsonObject(path) {
   try {
     const parsed = JSON.parse(await readFile2(path, "utf8"));
@@ -2133,17 +2129,11 @@ function stringField(value, key) {
   const field = value?.[key];
   return typeof field === "string" && field.trim() ? field : void 0;
 }
-function expandPath(value, baseDirectory, homeDirectory) {
-  if (value === "~") return homeDirectory;
-  if (value.startsWith("~/")) return resolve(homeDirectory, value.slice(2));
-  return isAbsolute(value) ? resolve(value) : resolve(baseDirectory, value);
-}
-function environmentHome(env) {
-  return env.HOME ? resolve(env.HOME) : homedir2();
+function expandPath(value, baseDirectory, env) {
+  return expandUserPath(value, env, baseDirectory);
 }
-function configPath(env, homeDirectory) {
-  const configHome = env.XDG_CONFIG_HOME ? resolve(env.XDG_CONFIG_HOME) : join5(homeDirectory, ".config");
-  return join5(configHome, "tuned-tensor", "config.json");
+function configPath(env) {
+  return join5(getConfigDir(env), "config.json");
 }
 function agentSelectionFrom(env, configAgent) {
   const stored = configAgent && typeof configAgent === "object" && !Array.isArray(configAgent) ? configAgent : {};
@@ -2199,7 +2189,6 @@ async function readLatestRun(storeRoot) {
 async function discoverShellContext(options = {}) {
   const env = options.env ?? process.env;
   const cwd = resolve(options.cwd ?? process.cwd());
-  const homeDirectory = environmentHome(env);
   const warnings = [];
   const specPath = join5(cwd, "tunedtensor.json");
   const specJson = await readJsonObject(specPath);
@@ -2229,14 +2218,15 @@ async function discoverShellContext(options = {}) {
   const localConfigDirectory = hasAdjacentLocalConfig ? dirname2(localConfigPath) : cwd;
   const configuredArtifactRoot = stringField(localConfigJson.value, "artifactRoot");
   const configuredStoreRoot = stringField(localConfigJson.value, "storeRoot");
-  const artifactRoot = configuredArtifactRoot ? expandPath(configuredArtifactRoot, localConfigDirectory, homeDirectory) : resolve(cwd, ".tt-local", "artifacts");
-  const storeRoot = configuredStoreRoot ? expandPath(configuredStoreRoot, localConfigDirectory, homeDirectory) : env.TT_LOCAL_HOME ? expandPath(env.TT_LOCAL_HOME, cwd, homeDirectory) : join5(homeDirectory, ".tuned-tensor-local");
-  const storedConfigPath = configPath(env, homeDirectory);
+  const artifactRoot = configuredArtifactRoot ? expandPath(configuredArtifactRoot, localConfigDirectory, env) : resolve(cwd, DEFAULT_ARTIFACT_ROOT);
+  const storeRoot = configuredStoreRoot ? expandPath(configuredStoreRoot, localConfigDirectory, env) : defaultStoreRoot(env);
+  const storedConfigPath = configPath(env);
   const storedConfigJson = await readJsonObject(storedConfigPath);
   if (storedConfigJson.invalid) {
     warnings.push("The Tuned Tensor config could not be parsed.");
   }
   const agent = agentSelectionFrom(env, storedConfigJson.value?.agent);
+  await hardenExistingLocalStore(storeRoot);
   const [activeModelId, latestRun] = await Promise.all([
     readActiveModelId(storeRoot),
     readLatestRun(storeRoot)
@@ -2789,10 +2779,10 @@ function assertNoArgs(command, args2) {
   }
 }
 function expandDirectory(value, cwd, env) {
-  const home = env.HOME ? resolve2(env.HOME) : homedir3();
+  const home = env.HOME ? resolve2(env.HOME) : homedir();
   if (value === "~") return home;
   if (value.startsWith("~/")) return resolve2(home, value.slice(2));
-  return isAbsolute2(value) ? resolve2(value) : resolve2(cwd, value);
+  return isAbsolute(value) ? resolve2(value) : resolve2(cwd, value);
 }
 function helpText(mode, query, palette = false) {
   const groups = groupedCatalog(mode, query);
@@ -3900,7 +3890,7 @@ import {
 import {
   basename as basename3,
   dirname as dirname3,
-  isAbsolute as isAbsolute3,
+  isAbsolute as isAbsolute2,
   join as join6,
   resolve as resolve3
 } from "path";
@@ -4624,7 +4614,7 @@ async function pathIsFile(path) {
   return (await stat4(path).catch(() => null))?.isFile() ?? false;
 }
 function resolveFromCwd(path, cwd) {
-  if (isAbsolute3(path)) return path;
+  if (isAbsolute2(path)) return path;
   return resolve3(cwd, path);
 }
 async function projectSpecArguments(originalArgs, cwd) {
@@ -5199,7 +5189,7 @@ ${result2.stderr}` : ""}`
 async function runFoundationPipeline(args2) {
   assertFoundationPlanSupported(args2.spec, args2.plan);
   const outputDir = resolve4(
-    args2.outputDir ?? join7(dirname4(resolve4(args2.specPath)), ".tt-foundation-runs", randomUUID5())
+    args2.outputDir ?? join7(dirname4(resolve4(args2.specPath)), DEFAULT_FOUNDATION_RUNS_DIR, randomUUID5())
   );
   await mkdir3(outputDir, { recursive: true, mode: 448 });
   await chmod2(outputDir, 448);
@@ -5909,7 +5899,7 @@ async function runCli(version, runtime = {}) {
 }
 
 // src/index.ts
-runCli("0.13.1-beta.3").catch((err) => {
+runCli("0.13.1-beta.4").catch((err) => {
   reportError(err);
   process.exit(1);
 });