@instafy/cli 0.1.8-staging.364 → 0.1.8-staging.366

package/README.md

@@ -24,6 +24,7 @@ Run Instafy projects locally and connect them back to Instafy Studio — from an
 - `instafy runtime:start` — start a local runtime (agent + origin).
 - `instafy runtime:status` — show health of the last started runtime.
 - `instafy runtime:stop` — stop the last started runtime.
+- `instafy git <args...>` — run git commands against an Instafy canonical checkout (`.instafy/.git`) when present.
 - `instafy tunnel` — start a detached tunnel for a local port.
   - `instafy tunnel:list` — list local tunnels started by the CLI.
   - `instafy tunnel:logs <tunnelId> --follow` — tail tunnel logs.

package/dist/auth.js

@@ -45,11 +45,33 @@ function looksLikeLocalControllerUrl(controllerUrl) {
         return controllerUrl.includes("127.0.0.1") || controllerUrl.includes("localhost");
     }
 }
-function deriveDefaultStudioUrl(controllerUrl) {
-    if (looksLikeLocalControllerUrl(controllerUrl)) {
-        return "http://localhost:5173";
+async function isStudioHealthy(studioUrl, timeoutMs) {
+    const target = new URL("/cli/login", studioUrl).toString();
+    const abort = new AbortController();
+    const timeout = setTimeout(() => abort.abort(), timeoutMs);
+    timeout.unref?.();
+    try {
+        const response = await fetch(target, { signal: abort.signal });
+        return response.ok;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
+async function resolveDefaultStudioUrl(controllerUrl) {
+    const hosted = "https://staging.instafy.dev";
+    if (isStagingCli) {
+        return hosted;
+    }
+    if (!looksLikeLocalControllerUrl(controllerUrl)) {
+        return hosted;
     }
-    return "https://staging.instafy.dev";
+    const local = "http://localhost:5173";
+    const healthy = await isStudioHealthy(local, 250);
+    return healthy ? local : hosted;
 }
 async function isControllerHealthy(controllerUrl, timeoutMs) {
     const target = `${controllerUrl.replace(/\/$/, "")}/healthz`;
@@ -228,7 +250,7 @@ export async function login(options) {
     const studioUrl = normalizeUrl(options.studioUrl ?? null) ??
         normalizeUrl(process.env["INSTAFY_STUDIO_URL"] ?? null) ??
         (isStagingCli ? null : resolveConfiguredStudioUrl({ profile })) ??
-        deriveDefaultStudioUrl(controllerUrl);
+        (await resolveDefaultStudioUrl(controllerUrl));
     const url = new URL("/cli/login", studioUrl);
     url.searchParams.set("serverUrl", controllerUrl);
     if (options.json) {

package/dist/git-wrapper.js

@@ -0,0 +1,85 @@
+import { spawnSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import kleur from "kleur";
+function pathExists(candidate) {
+    try {
+        fs.statSync(candidate);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function findInstafyGitContext(startDir) {
+    let current = path.resolve(startDir);
+    const root = path.parse(current).root;
+    while (true) {
+        const gitDir = path.join(current, ".instafy", ".git");
+        if (pathExists(gitDir)) {
+            return { workTree: current, gitDir };
+        }
+        if (current === root)
+            break;
+        current = path.dirname(current);
+    }
+    return null;
+}
+function validateGitArgs(userArgs) {
+    let parsingGlobalOptions = true;
+    for (let index = 0; index < userArgs.length; index += 1) {
+        const arg = userArgs[index] ?? "";
+        if (!parsingGlobalOptions) {
+            continue;
+        }
+        if (arg === "--") {
+            parsingGlobalOptions = false;
+            continue;
+        }
+        if (!arg.startsWith("-") || arg === "-") {
+            parsingGlobalOptions = false;
+            continue;
+        }
+        if (arg === "--git-dir" || arg.startsWith("--git-dir=") || arg === "--work-tree" || arg.startsWith("--work-tree=") || arg === "-C") {
+            throw new Error(`Unsupported argument "${arg}". Use ${kleur.cyan("cd")} instead; ${kleur.cyan("instafy git")} manages --git-dir/--work-tree automatically.`);
+        }
+        // Skip the value for global options that consume the next token.
+        if (arg === "-c" || arg === "--config-env" || arg === "--exec-path" || arg === "--namespace") {
+            index += 1;
+        }
+    }
+}
+export function buildInstafyGitArgs(context, userArgs) {
+    validateGitArgs(userArgs);
+    return ["--git-dir", context.gitDir, "--work-tree", context.workTree, ...userArgs];
+}
+export function runInstafyGit(userArgs, options) {
+    const cwd = options?.cwd ?? process.cwd();
+    if (userArgs.length === 0 || userArgs[0] === "--help" || userArgs[0] === "-h") {
+        // Keep this minimal so it doesn't diverge from Git help output.
+        console.log("instafy git <git-args...>");
+        console.log("");
+        console.log(`Runs ${kleur.cyan("git")} against the Instafy canonical repo at ${kleur.cyan(".instafy/.git")} (auto-detected by walking up from cwd).`);
+        console.log("");
+        console.log("Example:");
+        console.log(`  ${kleur.cyan('instafy git status')}`);
+        console.log(`  ${kleur.cyan('instafy git commit -am "instafy: checkpoint"')}`);
+        return 0;
+    }
+    const context = findInstafyGitContext(cwd);
+    if (!context) {
+        throw new Error([
+            "No Instafy canonical git checkout found (expected .instafy/.git).",
+            "",
+            "Tips:",
+            `- Run this inside a git-canonical workspace (where ${kleur.cyan(".instafy/.git")} exists).`,
+            `- If you're trying to operate on a user repo, use normal ${kleur.cyan("git")} (it uses .git).`,
+        ].join("\n"));
+    }
+    const args = buildInstafyGitArgs(context, userArgs);
+    const result = spawnSync("git", args, { stdio: "inherit", cwd });
+    if (result.error) {
+        throw new Error(`Failed to run git: ${result.error.message}`);
+    }
+    return typeof result.status === "number" ? result.status : 1;
+}

package/dist/index.js

@@ -11,6 +11,7 @@ import { listTunnelSessions, startTunnelDetached, stopTunnelSession, tailTunnelL
 import { requestControllerApi } from "./api.js";
 import { configGet, configList, configPath, configSet, configUnset } from "./config-command.js";
 import { getInstafyProfileConfigPath, listInstafyProfileNames, readInstafyProfileConfig } from "./config.js";
+import { runInstafyGit } from "./git-wrapper.js";
 export const program = new Command();
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
@@ -77,44 +78,6 @@ program
         process.exit(1);
     }
 });
-program
-    .command("profile:list")
-    .description("List saved CLI profiles (~/.instafy/profiles)")
-    .option("--json", "Output JSON")
-    .action(async (opts) => {
-    try {
-        const names = listInstafyProfileNames();
-        const profiles = names.map((name) => {
-            const config = readInstafyProfileConfig(name);
-            return {
-                name,
-                path: getInstafyProfileConfigPath(name),
-                controllerUrl: config.controllerUrl ?? null,
-                studioUrl: config.studioUrl ?? null,
-                accessTokenSet: Boolean(config.accessToken),
-                updatedAt: config.updatedAt ?? null,
-            };
-        });
-        if (opts.json) {
-            console.log(JSON.stringify({ profiles }, null, 2));
-            return;
-        }
-        if (profiles.length === 0) {
-            console.log(kleur.yellow("No profiles found."));
-            console.log(`Create one with: ${kleur.cyan("instafy login --profile <name>")}`);
-            return;
-        }
-        console.log(kleur.green("Instafy CLI profiles"));
-        for (const profile of profiles) {
-            const token = profile.accessTokenSet ? kleur.green("token") : kleur.yellow("no-token");
-            console.log(`- ${kleur.cyan(profile.name)} (${token})`);
-        }
-    }
-    catch (error) {
-        console.error(kleur.red(String(error)));
-        process.exit(1);
-    }
-});
 const projectInitCommand = program
     .command("project:init")
     .description("Create an Instafy project and link this folder (.instafy/project.json)")
@@ -170,6 +133,44 @@ program
         process.exit(1);
     }
 });
+program
+    .command("profile:list")
+    .description("List saved CLI profiles (~/.instafy/profiles)")
+    .option("--json", "Output JSON")
+    .action(async (opts) => {
+    try {
+        const names = listInstafyProfileNames();
+        const profiles = names.map((name) => {
+            const config = readInstafyProfileConfig(name);
+            return {
+                name,
+                path: getInstafyProfileConfigPath(name),
+                controllerUrl: config.controllerUrl ?? null,
+                studioUrl: config.studioUrl ?? null,
+                accessTokenSet: Boolean(config.accessToken),
+                updatedAt: config.updatedAt ?? null,
+            };
+        });
+        if (opts.json) {
+            console.log(JSON.stringify({ profiles }, null, 2));
+            return;
+        }
+        if (profiles.length === 0) {
+            console.log(kleur.yellow("No profiles found."));
+            console.log(`Create one with: ${kleur.cyan("instafy login --profile <name>")}`);
+            return;
+        }
+        console.log(kleur.green("Instafy CLI profiles"));
+        for (const profile of profiles) {
+            const token = profile.accessTokenSet ? kleur.green("token") : kleur.yellow("no-token");
+            console.log(`- ${kleur.cyan(profile.name)} (${token})`);
+        }
+    }
+    catch (error) {
+        console.error(kleur.red(String(error)));
+        process.exit(1);
+    }
+});
 const configCommand = program.command("config").description("Get/set saved CLI configuration");
 configCommand
     .command("path")
@@ -339,8 +340,8 @@ runtimeTokenCommand
     }
 });
 const gitTokenCommand = program
-    .command("git:token")
-    .description("Mint a git access token for the project repo")
+    .command("git:token", { hidden: true })
+    .description("Advanced: mint a git access token for the project repo")
     .option("--project <id>", "Project UUID (defaults to .instafy/project.json)");
 addServerUrlOptions(gitTokenCommand);
 addAccessTokenOptions(gitTokenCommand, "Instafy access token (required)");
@@ -379,6 +380,10 @@ gitTokenCommand
         process.exit(1);
     }
 });
+program
+    .command("git")
+    .description("Run git against the Instafy canonical checkout (.instafy/.git)")
+    .allowUnknownOption(true);
 program
     .command("git:credential", { hidden: true })
     .description("Internal: git credential helper (used by Git when configured)")
@@ -601,22 +606,22 @@ function configureApiCommand(command, method) {
     });
 }
 const apiGetCommand = program
-    .command("api:get")
+    .command("api:get", { hidden: true })
     .description("Advanced: authenticated GET request to the controller API")
     .argument("<path>", "API path (or full URL), e.g. /conversations/<id>/messages?limit=50");
 configureApiCommand(apiGetCommand, "GET");
 const apiPostCommand = program
-    .command("api:post")
+    .command("api:post", { hidden: true })
     .description("Advanced: authenticated POST request to the controller API")
     .argument("<path>", "API path (or full URL)");
 configureApiCommand(apiPostCommand, "POST");
 const apiPatchCommand = program
-    .command("api:patch")
+    .command("api:patch", { hidden: true })
     .description("Advanced: authenticated PATCH request to the controller API")
     .argument("<path>", "API path (or full URL)");
 configureApiCommand(apiPatchCommand, "PATCH");
 const apiDeleteCommand = program
-    .command("api:delete")
+    .command("api:delete", { hidden: true })
     .description("Advanced: authenticated DELETE request to the controller API")
     .argument("<path>", "API path (or full URL)");
 configureApiCommand(apiDeleteCommand, "DELETE");
@@ -625,6 +630,12 @@ export async function runCli(argv = process.argv) {
         program.outputHelp();
         return;
     }
+    const args = argv.slice(2);
+    if (args[0] === "git") {
+        const code = runInstafyGit(args.slice(1));
+        process.exitCode = code;
+        return;
+    }
     await program.parseAsync(argv);
 }
 if (import.meta.url === pathToFileURL(process.argv[1] ?? "").href) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instafy/cli",
-  "version": "0.1.8-staging.364",
+  "version": "0.1.8-staging.366",
   "description": "Run Instafy projects locally, link folders to Studio, and share previews/webhooks via tunnels.",
   "private": false,
   "publishConfig": {