amorphous-cli 0.3.9 → 0.3.10

package/lib/config.mjs

@@ -1,16 +1,46 @@
 import { readFileSync, existsSync } from 'node:fs'
 import { homedir } from 'node:os'
-import { join } from 'node:path'
+import { dirname, join, relative, resolve, sep } from 'node:path'
+import { fileURLToPath } from 'node:url'
 
-export function loadDotEnv(cwd = process.cwd()) {
+const CLI_PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..')
+
+function isWithin(root, path) {
+  const fromRoot = relative(resolve(root), resolve(path))
+  return fromRoot === '' || (fromRoot !== '..' && !fromRoot.startsWith(`..${sep}`))
+}
+
+function localRepositoryRoot(packageRoot) {
+  const root = resolve(packageRoot, '..')
+  try {
+    const appPackage = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'))
+    const cliPackage = JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf8'))
+    if (appPackage.name === 'amorphous' && cliPackage.name === 'amorphous-cli' && resolve(root, 'cli') === resolve(packageRoot)) {
+      return root
+    }
+  } catch {
+    /* The published CLI has no enclosing Amorphous app repository. */
+  }
+  return null
+}
+
+export function loadDotEnv(cwd = process.cwd(), options = {}) {
+  const packageRoot = options.packageRoot || CLI_PACKAGE_ROOT
+  const explicitRoot = options.amorphousRoot ?? process.env.AMORPHOUS_ROOT
   const roots = []
-  if (process.env.AMORPHOUS_ROOT) roots.push(process.env.AMORPHOUS_ROOT)
-  let dir = cwd
-  for (let i = 0; i < 8; i++) {
-    roots.push(dir)
-    const parent = join(dir, '..')
-    if (parent === dir) break
-    dir = parent
+  if (explicitRoot) {
+    roots.push(explicitRoot)
+  } else {
+    const repoRoot = localRepositoryRoot(packageRoot)
+    if (!repoRoot || !isWithin(repoRoot, cwd)) return
+    let dir = resolve(cwd)
+    for (let i = 0; i < 8; i++) {
+      roots.push(dir)
+      if (dir === repoRoot) break
+      const parent = dirname(dir)
+      if (parent === dir || !isWithin(repoRoot, parent)) break
+      dir = parent
+    }
   }
   for (const base of roots) {
     const path = join(base, '.env')

package/lib/config.test.mjs

@@ -0,0 +1,79 @@
+import assert from 'node:assert/strict'
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import test from 'node:test'
+import { loadDotEnv } from './config.mjs'
+
+function withEnv(values, run) {
+  const previous = Object.fromEntries(Object.keys(values).map((name) => [name, process.env[name]]))
+  for (const [name, value] of Object.entries(values)) {
+    if (value === undefined) delete process.env[name]
+    else process.env[name] = value
+  }
+  try {
+    return run()
+  } finally {
+    for (const [name, value] of Object.entries(previous)) {
+      if (value === undefined) delete process.env[name]
+      else process.env[name] = value
+    }
+  }
+}
+
+test('published CLI ignores an unrelated project .env by default', () => {
+  const root = mkdtempSync(join(tmpdir(), 'amorphous-config-'))
+  const project = join(root, 'project')
+  const packageRoot = join(root, 'npm-cache', 'amorphous-cli')
+  mkdirSync(project, { recursive: true })
+  mkdirSync(packageRoot, { recursive: true })
+  writeFileSync(join(project, '.env'), 'APP_ORIGIN=https://amorphous.test\n')
+
+  try {
+    withEnv({ APP_ORIGIN: undefined, AMORPHOUS_ROOT: undefined }, () => {
+      loadDotEnv(project, { packageRoot })
+      assert.equal(process.env.APP_ORIGIN, undefined)
+    })
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+test('repository source CLI loads the repository .env for local development', () => {
+  const root = mkdtempSync(join(tmpdir(), 'amorphous-config-'))
+  const cliRoot = join(root, 'cli')
+  mkdirSync(cliRoot, { recursive: true })
+  writeFileSync(join(root, 'package.json'), JSON.stringify({ name: 'amorphous' }))
+  writeFileSync(join(cliRoot, 'package.json'), JSON.stringify({ name: 'amorphous-cli' }))
+  writeFileSync(join(root, '.env'), 'APP_ORIGIN=https://amorphous.test\n')
+
+  try {
+    withEnv({ APP_ORIGIN: undefined, AMORPHOUS_ROOT: undefined }, () => {
+      loadDotEnv(root, { packageRoot: cliRoot })
+      assert.equal(process.env.APP_ORIGIN, 'https://amorphous.test')
+    })
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+test('AMORPHOUS_ROOT explicitly opts a published CLI into a local .env', () => {
+  const root = mkdtempSync(join(tmpdir(), 'amorphous-config-'))
+  const project = join(root, 'project')
+  const localRoot = join(root, 'local-app')
+  const packageRoot = join(root, 'npm-cache', 'amorphous-cli')
+  mkdirSync(project, { recursive: true })
+  mkdirSync(localRoot, { recursive: true })
+  mkdirSync(packageRoot, { recursive: true })
+  writeFileSync(join(localRoot, '.env'), 'APP_ORIGIN=https://amorphous.test\n')
+
+  try {
+    withEnv({ APP_ORIGIN: undefined, AMORPHOUS_ROOT: undefined }, () => {
+      loadDotEnv(project, { packageRoot, amorphousRoot: localRoot })
+      assert.equal(process.env.APP_ORIGIN, 'https://amorphous.test')
+    })
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amorphous-cli",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "mcpName": "io.github.amorphous-one/amorphous",
   "description": "Make whatever you want, yourself, with your own agent, or with others.",
   "type": "module",

package/skill/amorphous/SKILL.md

@@ -40,7 +40,7 @@ They tell you when to push, preview, publish, or invite. Do those when they ask.
 
 ## Start
 
-Run CLI commands as `npx --yes amorphous-cli@latest <command>`; this uses the latest CLI without a global install. The command examples below abbreviate that prefix as `amorphous-cli`. If a command prints `Run: npx --yes amorphous-cli@latest setup`, run that line, then repeat the command. If you are not signed in, run `npx --yes amorphous-cli@latest login`. Show the person the link it prints and ask them to finish in the browser. Do not ask for an email or a code.
+Run CLI commands as `npx --yes amorphous-cli@latest <command>`; this uses the latest CLI without a global install. The published CLI ignores `.env` files in the current project and uses the hosted app. To explicitly use local settings, set `AMORPHOUS_ROOT` to the local Amorphous repo root. The command examples below abbreviate that prefix as `amorphous-cli`. If a command prints `Run: npx --yes amorphous-cli@latest setup`, run that line, then repeat the command. If you are not signed in, run `npx --yes amorphous-cli@latest login`. Show the person the link it prints and ask them to finish in the browser. Do not ask for an email or a code.
 
 Then choose the path that matches the request: