@neverquits/nq 0.1.2 → 0.1.4

package/bin/nq.mjs

@@ -28,20 +28,20 @@ function printHelp() {
   nq — NeverQuits CLI
 
   Usage:
-    nq login                          Log in with your access token
-    nq pull <agent> --org <orgId>     Clone agent workspace
-    nq push [-m "message"]            Commit and push changes
-    nq logout                         Clear stored credentials
-    nq status                         Show current config
+    nq login                                  Log in with your access token
+    nq pull <hiredAgentId>                    Clone the agent's workspace
+    nq push [-m "message"]                    Commit and push changes
+    nq logout                                 Clear stored credentials
+    nq status                                 Show current config
 
   Options:
-    nq pull <agent> --org <id> --session <id>   Also write .mcp.json
-    nq pull <agent> --org <id> --dir <path>     Custom clone directory
-    nq push --message "my changes"              Custom commit message
+    nq pull <hiredAgentId> --session <id>     Also write .mcp.json
+    nq pull <hiredAgentId> --dir <path>       Custom clone directory
+    nq push --message "my changes"            Custom commit message
 
   Examples:
     nq login
-    nq pull alex --org acme123 --session sess_abc
+    nq pull cmpl6d28g0004fy3icu397lqk
     nq push -m "updated research notes"
 `)
 }
@@ -81,13 +81,13 @@ async function main() {
 
   if (command === 'pull') {
     const { flags, positional } = parseFlags(args.slice(1))
-    const agentKey = positional[0]
-    if (!agentKey) {
-      console.error('Usage: nq pull <agent> --org <orgId>')
+    const target = positional[0]
+    if (!target) {
+      console.error('Usage: nq pull <hiredAgentId>')
       process.exit(1)
     }
     const { pull } = await import('../lib/commands/pull.mjs')
-    await pull(agentKey, {
+    await pull(target, {
       org: flags.org,
       session: flags.session,
       dir: flags.dir,

package/lib/commands/pull.mjs

@@ -1,29 +1,40 @@
 import { execSync } from 'node:child_process'
 import { existsSync, writeFileSync } from 'node:fs'
-import { join, resolve } from 'node:path'
+import { join, resolve, dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { apiFetch, getToken } from '../api.mjs'
 import { getApiUrl } from '../config.mjs'
 
-export async function pull(agentKey, options) {
-  const orgId = options.org
-  if (!orgId) {
-    console.error('Missing --org flag. Usage: nq pull <agent> --org <orgId>')
+const NQ_BIN = resolve(dirname(fileURLToPath(import.meta.url)), '..', '..', 'bin', 'nq.mjs')
+const NODE_BIN = process.execPath
+
+export async function pull(positional, options) {
+  // Two call shapes:
+  //   nq pull <hiredAgentId>                       (preferred)
+  //   nq pull <agentKey> --org <orgId>             (legacy)
+  // Distinguish by whether --org was passed.
+  const useLegacy = Boolean(options.org)
+  const body = useLegacy
+    ? { orgId: options.org, agentKey: positional }
+    : { hiredAgentId: positional }
+
+  if (!positional) {
+    console.error('Usage: nq pull <hiredAgentId>')
+    console.error('   or: nq pull <agentKey> --org <orgId>   (legacy)')
     process.exit(1)
   }
 
-  const sessionId = options.session
-  const dir = options.dir ?? `${orgId}-${agentKey}`
-  const dest = resolve(dir)
-
   console.log()
-  console.log(`  Pulling workspace: ${orgId}/${agentKey}`)
+  console.log(useLegacy
+    ? `  Pulling workspace: ${body.orgId}/${body.agentKey}`
+    : `  Pulling workspace: ${positional}`)
 
   // Ask the backend for a fresh installation token + the repo identifier.
   // The token is short-lived; we bake it into the clone URL once and then
   // configure a credential helper so future pushes/pulls mint a new one.
   const tokenRes = await apiFetch('/api/workspace/install-token', {
     method: 'POST',
-    body: JSON.stringify({ orgId, agentKey }),
+    body: JSON.stringify(body),
   })
   if (tokenRes.status === 404) {
     console.error('  No workspace repo found. Has onboarding been completed for this org?')
@@ -33,7 +44,23 @@ export async function pull(agentKey, options) {
     console.error(`  Failed to mint install token: ${tokenRes.status}`)
     process.exit(1)
   }
-  const { token, username, githubOrg, repoName } = await tokenRes.json()
+  const {
+    token,
+    username,
+    githubOrg,
+    repoName,
+    orgId: resolvedOrgId,
+    agentKey: resolvedAgentKey,
+  } = await tokenRes.json()
+
+  // The server always echoes back resolvedOrgId + resolvedAgentKey so the
+  // CLI can stash them in .git/config for the credential helper.
+  const orgId = resolvedOrgId ?? options.org
+  const agentKey = resolvedAgentKey ?? positional
+
+  const sessionId = options.session
+  const dir = options.dir ?? `${orgId}-${agentKey}`
+  const dest = resolve(dir)
 
   const gitDir = join(dest, '.git')
 
@@ -70,7 +97,7 @@ export async function pull(agentKey, options) {
     console.log('  Wrote .mcp.json')
   } else {
     console.log('  Skipped .mcp.json (no --session). Create a session first, then run:')
-    console.log(`    nq pull ${agentKey} --org ${orgId} --session <sessionId>`)
+    console.log(`    nq pull ${positional} --session <sessionId>`)
   }
 
   console.log()
@@ -100,14 +127,17 @@ function setRemote(dest, url) {
 }
 
 function configureCredentialHelper(dest, orgId, agentKey) {
-  // The helper is invoked by git as `nq credential-helper get` (etc).
-  // Stash the workspace identifiers so the helper knows what to ask for.
+  // The helper is invoked by git during a github.com auth challenge.
+  // We point at the *absolute* path of this nq install (node binary +
+  // bin/nq.mjs) so the helper works regardless of whether `nq` is on
+  // the user's PATH — e.g. when they invoked us via `npx`.
+  const helperCmd = `${shArg(NODE_BIN)} ${shArg(NQ_BIN)} credential-helper`
   const cmds = [
     ['nq.orgId', orgId],
     ['nq.agentKey', agentKey],
     // Per-host helper, applied only inside this repo via --local config.
     // The '!' prefix tells git to run it as a shell command.
-    ['credential.https://github.com.helper', '!nq credential-helper'],
+    ['credential.https://github.com.helper', `!${helperCmd}`],
   ]
   for (const [k, v] of cmds) {
     execSync(`git config --local ${shArg(k)} ${shArg(v)}`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neverquits/nq",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "NeverQuits CLI — workspace setup for AI agent operators",
   "type": "module",
   "bin": {