@osfactory/har 0.63.0 → 0.64.1

package/dist/index.js

@@ -29230,9 +29230,6 @@ function resolvePortalTargetsForRepo(options) {
     const aliases = getRepoPortalTargetAliases(options.repoPath);
     const attached = aliases.map((alias) => getPortalTargetRecord(alias)).filter((entry) => entry !== null).map(recordToPortalTarget);
     if (attached.length > 0) return { source: "repo", targets: attached };
-    if (store.targets.length === 1) {
-      return { source: "single", targets: [recordToPortalTarget(store.targets[0])] };
-    }
     return null;
   }
   if (store.defaultTarget) {
@@ -32316,6 +32313,8 @@ function extractClaudeUsageFromRecords(records) {
   let tokensCacheCreation = 0;
   let costUsd = null;
   const modelBreakdown = {};
+  const billed = /* @__PURE__ */ new Map();
+  const unkeyed = [];
   for (const record2 of records) {
     if (!record2 || typeof record2 !== "object") continue;
     const payload = record2;
@@ -32330,29 +32329,34 @@ function extractClaudeUsageFromRecords(records) {
     const message = payload.message;
     const nestedUsage = payload.usage ?? message?.usage;
     if (nestedUsage && payload.type !== "result") {
-      const i = Number(nestedUsage.input_tokens ?? 0);
-      const o = Number(nestedUsage.output_tokens ?? 0);
-      const cr = Number(nestedUsage.cache_read_input_tokens ?? 0);
-      const cc = Number(nestedUsage.cache_creation_input_tokens ?? 0);
-      tokensInput += i;
-      tokensOutput += o;
-      tokensCacheRead += cr;
-      tokensCacheCreation += cc;
       const model = typeof message?.model === "string" ? message.model : void 0;
-      if (model && model !== "<synthetic>") {
-        const totals = modelBreakdown[model] ??= {
-          tokensInput: 0,
-          tokensOutput: 0,
-          tokensCacheRead: 0,
-          tokensCacheCreation: 0,
-          tokensTotal: 0
-        };
-        totals.tokensInput += i;
-        totals.tokensOutput += o;
-        totals.tokensCacheRead += cr;
-        totals.tokensCacheCreation += cc;
-        totals.tokensTotal += i + o + cr + cc;
-      }
+      const entry = { usage: nestedUsage, model };
+      if (typeof message?.id === "string" && message.id) billed.set(message.id, entry);
+      else unkeyed.push(entry);
+    }
+  }
+  for (const { usage: usage2, model } of [...billed.values(), ...unkeyed]) {
+    const i = Number(usage2.input_tokens ?? 0);
+    const o = Number(usage2.output_tokens ?? 0);
+    const cr = Number(usage2.cache_read_input_tokens ?? 0);
+    const cc = Number(usage2.cache_creation_input_tokens ?? 0);
+    tokensInput += i;
+    tokensOutput += o;
+    tokensCacheRead += cr;
+    tokensCacheCreation += cc;
+    if (model && model !== "<synthetic>") {
+      const totals = modelBreakdown[model] ??= {
+        tokensInput: 0,
+        tokensOutput: 0,
+        tokensCacheRead: 0,
+        tokensCacheCreation: 0,
+        tokensTotal: 0
+      };
+      totals.tokensInput += i;
+      totals.tokensOutput += o;
+      totals.tokensCacheRead += cr;
+      totals.tokensCacheCreation += cc;
+      totals.tokensTotal += i + o + cr + cc;
     }
   }
   return { tokensInput, tokensOutput, tokensCacheRead, tokensCacheCreation, costUsd, modelBreakdown };
@@ -32391,8 +32395,9 @@ function findMatchingClaudeTranscripts(slot) {
           }
         }
       }
-      if (primaryHit) primary.push({ filePath, records, mtimeMs: stat.mtimeMs });
-      else if (fallbackHit) fallback.push({ filePath, records, mtimeMs: stat.mtimeMs });
+      if (primaryHit) primary.push({ filePath, records, mtimeMs: stat.mtimeMs, primary: true });
+      else if (fallbackHit)
+        fallback.push({ filePath, records, mtimeMs: stat.mtimeMs, primary: false });
     }
   }
   primary.sort((a, b2) => b2.mtimeMs - a.mtimeMs);
@@ -32449,18 +32454,14 @@ function harvestClaudeUsage(slot) {
     suffix: slot.suffix,
     createdAt: slot.sessionCreatedAt
   });
-  let best = null;
-  for (const match of matches) {
-    const usage2 = extractClaudeUsageFromRecords(match.records);
-    if (usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead === 0 && (usage2.costUsd == null || usage2.costUsd === 0)) {
-      continue;
-    }
-    best = usage2;
-    break;
+  const own = matches.filter((match) => match.primary);
+  const usable = own.length > 0 ? own : matches;
+  const usage2 = extractClaudeUsageFromRecords(usable.flatMap((match) => match.records));
+  if (usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead === 0 && (usage2.costUsd == null || usage2.costUsd === 0)) {
+    return null;
   }
-  if (!best) return null;
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const tokensTotal = best.tokensInput + best.tokensOutput + best.tokensCacheRead + best.tokensCacheCreation;
+  const tokensTotal = usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead + usage2.tokensCacheCreation;
   return {
     sessionKey,
     agentId: slot.agentId,
@@ -32468,13 +32469,13 @@ function harvestClaudeUsage(slot) {
     workDir: slot.workDir,
     branch: slot.branch,
     suffix: slot.suffix,
-    tokensInput: best.tokensInput,
-    tokensOutput: best.tokensOutput,
-    tokensCacheRead: best.tokensCacheRead,
-    tokensCacheCreation: best.tokensCacheCreation,
+    tokensInput: usage2.tokensInput,
+    tokensOutput: usage2.tokensOutput,
+    tokensCacheRead: usage2.tokensCacheRead,
+    tokensCacheCreation: usage2.tokensCacheCreation,
     tokensTotal,
-    costUsd: best.costUsd,
-    ...Object.keys(best.modelBreakdown).length > 0 ? { modelBreakdown: best.modelBreakdown } : {},
+    costUsd: usage2.costUsd,
+    ...Object.keys(usage2.modelBreakdown).length > 0 ? { modelBreakdown: usage2.modelBreakdown } : {},
     sources: ["harvest"],
     firstSeenAt: slot.sessionCreatedAt ?? now,
     lastSeenAt: now
@@ -74842,7 +74843,30 @@ function openBrowser(url) {
   } catch {
   }
 }
-async function loginViaBrowser(portalUrl, openUrl = openBrowser) {
+var REPOS_QUERY_BUDGET = 1800;
+function encodeCliReposQuery(repos) {
+  const unique = [...new Set(repos.filter((repo) => repo.trim().length > 0))];
+  if (unique.length === 0) return null;
+  const encoded = encodeURIComponent(JSON.stringify(unique));
+  if (encoded.length > REPOS_QUERY_BUDGET) return null;
+  return encoded;
+}
+function parseCliTargetsParam(raw) {
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(Buffer.from(raw, "base64url").toString("utf8"));
+    if (!Array.isArray(parsed.targets)) return null;
+    const targets = parsed.targets.filter(
+      (entry) => typeof entry?.workspaceId === "string" && typeof entry?.token === "string" && Array.isArray(entry.repos)
+    );
+    return targets.length > 0 ? targets : null;
+  } catch {
+    return null;
+  }
+}
+async function loginViaBrowser(portalUrl, openUrlOrOptions = openBrowser) {
+  const options = typeof openUrlOrOptions === "function" ? { openUrl: openUrlOrOptions } : openUrlOrOptions;
+  const openUrl = options.openUrl ?? openBrowser;
   const state = (0, import_crypto.randomUUID)();
   return new Promise((resolve53, reject) => {
     let timer;
@@ -74871,6 +74895,7 @@ async function loginViaBrowser(portalUrl, openUrl = openBrowser) {
       res.writeHead(200, { "Content-Type": "text/html" });
       res.end("<h1>Logged in</h1><p>You can close this tab and return to the terminal.</p>");
       cleanup();
+      const targets = parseCliTargetsParam(requestUrl.searchParams.get("targets"));
       resolve53({
         portalUrl,
         token,
@@ -74881,7 +74906,8 @@ async function loginViaBrowser(portalUrl, openUrl = openBrowser) {
         email: email2,
         refreshToken,
         expiresAt,
-        createdAt: (/* @__PURE__ */ new Date()).toISOString()
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        ...targets ? { targets } : {}
       });
     });
     const cleanup = () => {
@@ -74895,7 +74921,8 @@ async function loginViaBrowser(portalUrl, openUrl = openBrowser) {
     server.listen(0, "127.0.0.1", () => {
       const { port } = server.address();
       const callback = `http://127.0.0.1:${port}${CALLBACK_PATH}`;
-      const loginUrl = `${portalUrl}/cli/login?callback=${encodeURIComponent(callback)}&state=${state}`;
+      const reposQuery = encodeCliReposQuery(options.repos ?? []);
+      const loginUrl = `${portalUrl}/cli/login?callback=${encodeURIComponent(callback)}&state=${state}${reposQuery ? `&repos=${reposQuery}` : ""}`;
       openUrl(loginUrl);
       process.stderr.write(`Opening ${loginUrl}
 If your browser did not open, paste that URL.
@@ -74908,6 +74935,59 @@ If your browser did not open, paste that URL.
   });
 }
 
+// src/core/portal-repo-map.ts
+init_control_repo_path();
+init_control_registry();
+init_portal_targets();
+function planRepoWorkspaceMap(opts) {
+  const registered = (opts.registeredRepos ?? listRegisteredRepos()).map(
+    (repoPath) => canonicalizeControlRepoPath(repoPath)
+  );
+  const current = opts.currentRepo ? canonicalizeControlRepoPath(opts.currentRepo) : null;
+  const others = registered.filter((repoPath) => repoPath !== current);
+  const connections = opts.connections ?? listPortalTargetRecords();
+  if (others.length === 0 || connections.length === 0) return { kind: "none" };
+  if (connections.length === 1) {
+    const only = connections[0];
+    return {
+      kind: "attach-more",
+      workspaceAlias: only.alias,
+      workspaceLabel: displayPortalTargetLabel(only),
+      repos: others
+    };
+  }
+  return {
+    kind: "map-orgs",
+    currentAlias: opts.currentAlias,
+    repos: others,
+    connections: connections.map((entry) => ({
+      alias: entry.alias,
+      label: displayPortalTargetLabel(entry)
+    }))
+  };
+}
+function applyRepoWorkspaceMap(assignments) {
+  const attached = [];
+  for (const row of assignments) {
+    if (!row.alias) continue;
+    const canonical = canonicalizeControlRepoPath(row.repoPath);
+    attachRepoPortalTarget(canonical, row.alias);
+    recordRepoForControlSync(canonical);
+    attached.push(canonical);
+  }
+  return attached;
+}
+function remainingUnassignedRepos(repos, assigned) {
+  const taken = new Set(
+    [...assigned].map((repoPath) => canonicalizeControlRepoPath(repoPath))
+  );
+  return repos.filter((repoPath) => !taken.has(canonicalizeControlRepoPath(repoPath)));
+}
+function remainingConnections(connections, usedAliases) {
+  const used = /* @__PURE__ */ new Set([...usedAliases]);
+  return connections.filter((entry) => !used.has(entry.alias));
+}
+
 // src/core/portal-connect.ts
 init_portal_targets();
 function attachRepoIfPresent(alias, repoPath) {
@@ -74930,9 +75010,16 @@ async function runPortalConnect(input) {
       token: input.apiKey,
       setAsDefault: true
     });
-    return { record: record3, attachedRepo: attachRepoIfPresent(record3.alias, input.repoPath) };
+    return {
+      record: record3,
+      attachedRepo: attachRepoIfPresent(record3.alias, input.repoPath),
+      extraAttached: [],
+      mappedInBrowser: false
+    };
   }
-  const creds = await loginViaBrowser(input.portalUrl);
+  const creds = await loginViaBrowser(input.portalUrl, {
+    repos: listRegisteredReposForConnect(input.repoPath)
+  });
   const record2 = upsertPortalTarget({
     alias: input.alias,
     portalUrl: input.portalUrl,
@@ -74946,7 +75033,35 @@ async function runPortalConnect(input) {
     email: creds.email,
     setAsDefault: true
   });
-  return { record: record2, attachedRepo: attachRepoIfPresent(record2.alias, input.repoPath) };
+  const attachedRepo = attachRepoIfPresent(record2.alias, input.repoPath);
+  if (!creds.targets || creds.targets.length === 0) {
+    return { record: record2, attachedRepo, extraAttached: [], mappedInBrowser: false };
+  }
+  const extraAttached = [];
+  for (const target of creds.targets) {
+    const next = upsertPortalTarget({
+      portalUrl: input.portalUrl,
+      workspaceId: target.workspaceId,
+      workspace: target.workspace,
+      workspaceSlug: target.workspace,
+      workspaceName: target.workspaceName,
+      token: target.token,
+      refreshToken: target.refreshToken,
+      expiresAt: target.expiresAt,
+      email: creds.email,
+      setAsDefault: false
+    });
+    const attached = applyRepoWorkspaceMap(
+      target.repos.map((repoPath) => ({ repoPath, alias: next.alias }))
+    );
+    extraAttached.push(...attached.filter((repoPath) => repoPath !== attachedRepo));
+  }
+  return { record: record2, attachedRepo, extraAttached, mappedInBrowser: true };
+}
+function listRegisteredReposForConnect(repoPath) {
+  const resolved = repoPath ? path59.resolve(repoPath) : null;
+  const current = resolved && fs49.existsSync(resolved) ? canonicalizeControlRepoPath(resolved) : null;
+  return [.../* @__PURE__ */ new Set([...current ? [current] : [], ...listRegisteredRepos()])];
 }
 
 // src/cli/commands/hq.ts
@@ -74978,7 +75093,7 @@ var hqCommand = {
       alias: "y",
       type: "boolean",
       default: false,
-      describe: "Skip the destination prompt and use the resolved portal URL"
+      describe: "Skip interactive prompts (portal URL and extra-repo mapping)"
     }),
     (argv) => handleHqConnect(
       argv
@@ -75036,6 +75151,90 @@ async function resolveConnectPortalUrl(explicit, skipPrompt) {
   ]);
   return resolvePortalUrl(url);
 }
+async function promptExtraRepoAttachments(opts) {
+  const plan = planRepoWorkspaceMap(opts);
+  if (plan.kind === "none") return [];
+  const noun = plan.repos.length === 1 ? "repository" : "repositories";
+  info(`${plan.repos.length} other registered ${noun}:`);
+  for (const repoPath of plan.repos) info(`  ${repoPath}`);
+  if (plan.kind === "attach-more") {
+    const { selected } = await esm_default13.prompt([
+      {
+        type: "checkbox",
+        name: "selected",
+        message: `Attach which of these ${plan.repos.length} ${noun} to ${plan.workspaceLabel}?`,
+        choices: plan.repos.map((repoPath) => ({
+          name: repoPath,
+          value: repoPath,
+          checked: true
+        }))
+      }
+    ]);
+    return applyRepoWorkspaceMap(
+      selected.map((repoPath) => ({ repoPath, alias: plan.workspaceAlias }))
+    );
+  }
+  const { sendAll } = await esm_default13.prompt([
+    {
+      type: "confirm",
+      name: "sendAll",
+      message: `Send all ${plan.repos.length} ${noun} to the same workspace?`,
+      default: true
+    }
+  ]);
+  if (sendAll) {
+    const { alias } = await esm_default13.prompt([
+      {
+        type: "list",
+        name: "alias",
+        message: "Which workspace?",
+        default: plan.currentAlias,
+        choices: plan.connections.map((entry) => ({
+          name: entry.label,
+          value: entry.alias
+        }))
+      }
+    ]);
+    return applyRepoWorkspaceMap(plan.repos.map((repoPath) => ({ repoPath, alias })));
+  }
+  const attached = [];
+  let remainingRepos = [...plan.repos];
+  let remainingOrgs = [...plan.connections];
+  while (remainingRepos.length > 0 && remainingOrgs.length > 0) {
+    const left2 = remainingRepos.length === 1 ? "repository" : "repositories";
+    info(`${remainingRepos.length} ${left2} left to assign.`);
+    const { alias } = await esm_default13.prompt([
+      {
+        type: "list",
+        name: "alias",
+        message: "Workspace to assign repositories to",
+        default: remainingOrgs.some((entry) => entry.alias === plan.currentAlias) ? plan.currentAlias : remainingOrgs[0]?.alias,
+        choices: [
+          ...remainingOrgs.map((entry) => ({
+            name: entry.label,
+            value: entry.alias
+          })),
+          { name: "Done \u2014 leave the rest unattached", value: "" }
+        ]
+      }
+    ]);
+    if (!alias) break;
+    const { selected } = await esm_default13.prompt([
+      {
+        type: "checkbox",
+        name: "selected",
+        message: `Repositories for ${remainingOrgs.find((entry) => entry.alias === alias)?.label ?? alias}`,
+        choices: remainingRepos.map((repoPath) => ({ name: repoPath, value: repoPath }))
+      }
+    ]);
+    if (selected.length > 0) {
+      attached.push(...applyRepoWorkspaceMap(selected.map((repoPath) => ({ repoPath, alias }))));
+    }
+    remainingRepos = remainingUnassignedRepos(remainingRepos, selected);
+    remainingOrgs = remainingConnections(remainingOrgs, [alias]);
+  }
+  return attached;
+}
 async function handleHqConnect(argv) {
   if (argv.deprecated) {
     warn("har control login is deprecated \u2014 use har hq connect");
@@ -75046,7 +75245,7 @@ async function handleHqConnect(argv) {
     info(`Portal: ${portalUrl} (${PORTAL_SOURCE_LABEL[source]})`);
   }
   try {
-    const { record: record2, attachedRepo } = await runPortalConnect({
+    const { record: record2, attachedRepo, extraAttached, mappedInBrowser } = await runPortalConnect({
       portalUrl,
       apiKey: argv.apiKey,
       repoPath: argv.repo ?? ".",
@@ -75074,6 +75273,18 @@ async function handleHqConnect(argv) {
     } else {
       info("No local repository attached (run this from a repo, or pass --repo).");
     }
+    for (const repoPath of extraAttached) {
+      success(`Attached ${repoPath}`);
+    }
+    if (!argv.json && !argv.yes && !mappedInBrowser && isInteractive()) {
+      const extra = await promptExtraRepoAttachments({
+        currentRepo: attachedRepo,
+        currentAlias: record2.alias
+      });
+      for (const repoPath of extra) {
+        success(`Attached ${repoPath}`);
+      }
+    }
     info("Sync: har control sync");
   } catch (err) {
     error(`Connect failed: ${err.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osfactory/har",
-  "version": "0.63.0",
+  "version": "0.64.1",
   "description": "HAR: open agent harness CLI and MCP server for coding agents, isolated worktrees, and software-factory workflows",
   "keywords": [
     "har",