@handsupmin/gc-tree 1.1.3 → 1.1.4

package/dist/src/cli.js

@@ -9,7 +9,7 @@ import { dispatchGcTreeHook } from './hook.js';
 import { onboardBranch } from './onboard.js';
 import { buildProviderLaunchPlan, maybeLaunchProvider, promptLanguageSelection, promptLaunchProviderSelection, promptProviderSelection, } from './provider.js';
 import { DEFAULT_BRANCH, branchDir, resolveHome } from './paths.js';
-import { branchRepoMapPath, branchScopeStatus, detectCurrentRepoId, promptResolveScopeDecision, readBranchRepoMap, resolveBranchForRepo, setRepoScopeForBranch, } from './repo-map.js';
+import { branchRepoMapPath, detectCurrentRepoId, promptResolveScopeDecision, readBranchRepoMap, resolveBranchForRepo, setRepoScopeForBranch, } from './repo-map.js';
 import { findRelatedDocs, getDocById, resolveContext } from './resolve.js';
 import { scaffoldHostIntegration } from './scaffold.js';
 import { appendScaffoldedHost, requirePreferredProvider, writeSettings, readSettings } from './settings.js';
@@ -47,14 +47,14 @@ function usage() {
   gctree branches [--home DIR]
   gctree repo-map [--home DIR]
   gctree set-repo-scope --branch NAME [--repo NAME] [--cwd DIR] (--include|--exclude) [--home DIR]
-  gctree status [--home DIR] [--cwd DIR]
+  gctree status [--home DIR] [--branch NAME] [--cwd DIR]
   gctree onboard [--home DIR] [--branch NAME] [--provider <codex|claude-code>] [--target DIR] [--no-launch]
   gctree verify-onboarding [--home DIR] [--branch NAME]
   gctree reset-gc-branch [--home DIR] [--branch NAME] --yes
   gctree uninstall [--home DIR] [--target DIR] [--host <codex|claude-code|both>] [--keep-home] --yes
   gctree resolve --query TEXT [--home DIR] [--branch NAME] [--cwd DIR]
-  gctree show-doc --id ID [--home DIR] [--branch NAME]
-  gctree related --id ID [--home DIR] [--branch NAME]
+  gctree show-doc --id ID [--home DIR] [--branch NAME] [--cwd DIR]
+  gctree related --id ID [--home DIR] [--branch NAME] [--cwd DIR]
   gctree update-global-context [--home DIR] [--branch NAME] [--provider <codex|claude-code>] [--target DIR] [--no-launch]
   gctree update-gc [--home DIR] [--branch NAME] [--provider <codex|claude-code>] [--target DIR] [--no-launch]
   gctree ugc [--home DIR] [--branch NAME] [--provider <codex|claude-code>] [--target DIR] [--no-launch]
@@ -78,6 +78,15 @@ async function readStdinText() {
     }
     return Buffer.concat(chunks).toString('utf8');
 }
+async function resolveCommandBranch({ home, explicitBranch, cwd, }) {
+    const head = (await readHead(home)) || DEFAULT_BRANCH;
+    return resolveBranchForRepo({
+        home,
+        head,
+        explicitBranch,
+        cwd: cwd || process.cwd(),
+    });
+}
 function compactMatchCommands(id, home, branch) {
     const homeArg = `--home ${JSON.stringify(home)}`;
     const branchArg = `--branch ${JSON.stringify(branch)}`;
@@ -276,22 +285,26 @@ async function main() {
             return;
         }
         case 'status': {
-            const gcBranch = (await readHead(home)) || DEFAULT_BRANCH;
+            const resolved = await resolveCommandBranch({
+                home,
+                explicitBranch: readArg('--branch') || undefined,
+                cwd: readArg('--cwd') || process.cwd(),
+            });
+            const gcBranch = resolved.gc_branch;
             if (!existsSync(branchDir(home, gcBranch))) {
                 throw new Error('gc-tree is not initialized. Run `gctree init` first.');
             }
             const result = await statusForBranch(home, gcBranch);
             const settings = await readSettings(home);
-            const mapping = await readBranchRepoMap(home);
-            const currentRepo = await detectCurrentRepoId(readArg('--cwd') || process.cwd());
             console.log(JSON.stringify({
                 ...result,
                 provider_mode: settings?.provider_mode || null,
                 preferred_provider: settings?.preferred_provider || null,
                 preferred_language: settings?.preferred_language || null,
-                current_repo: currentRepo,
+                current_repo: resolved.current_repo,
+                source: resolved.source,
                 branch_repo_map_path: branchRepoMapPath(home),
-                repo_scope_status: branchScopeStatus(mapping, gcBranch, currentRepo),
+                repo_scope_status: resolved.scope_status,
             }, null, 2));
             return;
         }
@@ -365,10 +378,8 @@ async function main() {
             const query = readArg('--query');
             if (!query)
                 usage();
-            const head = (await readHead(home)) || DEFAULT_BRANCH;
-            const resolved = await resolveBranchForRepo({
+            const resolved = await resolveCommandBranch({
                 home,
-                head,
                 explicitBranch: readArg('--branch') || undefined,
                 cwd: readArg('--cwd') || process.cwd(),
             });
@@ -491,10 +502,24 @@ async function main() {
             const id = readArg('--id');
             if (!id)
                 usage();
-            const gcBranch = readArg('--branch') || (await readHead(home)) || DEFAULT_BRANCH;
+            const resolved = await resolveCommandBranch({
+                home,
+                explicitBranch: readArg('--branch') || undefined,
+                cwd: readArg('--cwd') || process.cwd(),
+            });
+            const gcBranch = resolved.gc_branch;
             const branchStatus = await statusForBranch(home, gcBranch);
             if (branchStatus.doc_count === 0) {
-                console.log(JSON.stringify({ status: 'empty_branch', gc_branch: gcBranch, id, message: `gc-branch "${gcBranch}" has no docs yet.`, doc: null }, null, 2));
+                console.log(JSON.stringify({
+                    status: 'empty_branch',
+                    gc_branch: gcBranch,
+                    id,
+                    current_repo: resolved.current_repo,
+                    source: resolved.source,
+                    repo_scope_status: resolved.scope_status,
+                    message: `gc-branch "${gcBranch}" has no docs yet.`,
+                    doc: null,
+                }, null, 2));
                 return;
             }
             const doc = await getDocById({ home, branch: gcBranch, id });
@@ -502,6 +527,9 @@ async function main() {
                 status: doc ? 'matched' : 'doc_not_found',
                 gc_branch: gcBranch,
                 id,
+                current_repo: resolved.current_repo,
+                source: resolved.source,
+                repo_scope_status: resolved.scope_status,
                 message: doc ? `Loaded doc "${id}".` : `Doc "${id}" was not found in gc-branch "${gcBranch}".`,
                 doc,
             }, null, 2));
@@ -511,12 +539,20 @@ async function main() {
             const id = readArg('--id');
             if (!id)
                 usage();
-            const gcBranch = readArg('--branch') || (await readHead(home)) || DEFAULT_BRANCH;
+            const resolved = await resolveCommandBranch({
+                home,
+                explicitBranch: readArg('--branch') || undefined,
+                cwd: readArg('--cwd') || process.cwd(),
+            });
+            const gcBranch = resolved.gc_branch;
             const result = await findRelatedDocs({ home, branch: gcBranch, id });
             console.log(JSON.stringify({
                 status: result.status,
                 gc_branch: gcBranch,
                 id,
+                current_repo: resolved.current_repo,
+                source: resolved.source,
+                repo_scope_status: resolved.scope_status,
                 message: result.status === 'matched'
                     ? `Found ${result.matches.length} related docs for "${id}".`
                     : result.status === 'no_related_docs'

package/dist/src/hook.js

@@ -27,14 +27,14 @@ function limitMatches(matches, max = 3) {
 function displayKeyword(match) {
     return (match.label || match.title || match.id).trim();
 }
-function formatMatches(matches) {
+function formatMatches(matches, gcBranch) {
     return limitMatches(matches)
         .map((match) => {
         const summary = match.summary?.trim() ?? '';
         const excerpt = match.excerpt?.trim() ?? '';
         const context = summary || excerpt;
         const shortContext = context.length > 180 ? `${context.slice(0, 177).trim()}...` : context;
-        const showDoc = `gctree show-doc --id "${match.id}"`;
+        const showDoc = `gctree show-doc --id "${match.id}" --branch "${gcBranch}"`;
         return [
             `[${displayKeyword(match)}]`,
             shortContext,
@@ -59,7 +59,7 @@ function buildMatchContext({ gcBranch, currentRepo, repoScopeStatus, matches, })
     const lines = [
         `[gc-tree] USE FIRST: ${Math.min(matches.length, 3)} docs gc-branch="${gcBranch}" repo="${currentRepo || 'unscoped'}" scope=${repoScopeStatus}.`,
         '',
-        formatMatches(matches),
+        formatMatches(matches, gcBranch),
         '',
         `Rule: 위 문서를 먼저 근거로 삼고, 부족하면 details 명령으로 세부 정보를 확인.`,
     ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@handsupmin/gc-tree",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Global Context Tree, a lightweight branch-aware global context orchestrator for AI coding tools",
   "type": "module",
   "private": false,

package/dist/src/proposals.js

@@ -1,73 +0,0 @@
-import { mkdir, readFile, readdir, writeFile } from 'node:fs/promises';
-import { basename, join } from 'node:path';
-import { renderDocMarkdown, slugify } from './markdown.js';
-import { branchDir, branchDocsDir, branchProposalsDir, DEFAULT_BRANCH } from './paths.js';
-import { ensureBranchExists, updateBranchMeta, writeIndexFromDocs } from './store.js';
-export async function proposeUpdate({ home, input, branch, }) {
-    const targetBranch = branch || input.branch || DEFAULT_BRANCH;
-    await ensureBranchExists(home, targetBranch);
-    await mkdir(branchProposalsDir(home, targetBranch), { recursive: true });
-    const now = new Date().toISOString();
-    const id = `${now.replace(/[:.]/g, '-')}-${slugify(input.title)}`;
-    const proposal = {
-        version: 1,
-        id,
-        status: 'proposed',
-        branch: targetBranch,
-        title: input.title.trim(),
-        summary: input.summary.trim(),
-        created_at: now,
-        changes: input.docs.map((doc) => ({
-            path: `docs/${slugify(doc.slug || doc.title)}.md`,
-            title: doc.title.trim(),
-            summary: doc.summary.trim(),
-            body: doc.body.trim(),
-            ...(doc.tags?.length ? { tags: doc.tags } : {}),
-        })),
-    };
-    const proposalPath = join(branchProposalsDir(home, targetBranch), `${id}.json`);
-    await writeFile(proposalPath, `${JSON.stringify(proposal, null, 2)}\n`, 'utf8');
-    return { proposal_path: proposalPath, proposal };
-}
-export async function applyProposal({ home, proposalPath, }) {
-    const raw = await readFile(proposalPath, 'utf8');
-    const proposal = JSON.parse(raw);
-    await ensureBranchExists(home, proposal.branch);
-    await mkdir(branchDocsDir(home, proposal.branch), { recursive: true });
-    const updatedDocs = [];
-    for (const change of proposal.changes) {
-        const fullPath = join(branchDir(home, proposal.branch), change.path);
-        await writeFile(fullPath, renderDocMarkdown({
-            title: change.title,
-            summary: change.summary,
-            body: change.body,
-            tags: change.tags,
-        }), 'utf8');
-        updatedDocs.push(fullPath);
-    }
-    proposal.status = 'applied';
-    proposal.applied_at = new Date().toISOString();
-    await writeFile(proposalPath, `${JSON.stringify(proposal, null, 2)}\n`, 'utf8');
-    await writeIndexFromDocs(home, proposal.branch);
-    await updateBranchMeta(home, proposal.branch, {
-        summary: proposal.summary || (await readBranchSummary(home, proposal.branch)),
-    });
-    return {
-        branch: proposal.branch,
-        updated_docs: updatedDocs,
-        proposal_path: proposalPath,
-    };
-}
-async function readBranchSummary(home, branch) {
-    const branchJson = await readFile(join(branchDir(home, branch), 'branch.json'), 'utf8');
-    return JSON.parse(branchJson).summary || '';
-}
-export async function listProposals(home, branch) {
-    return (await readdir(branchProposalsDir(home, branch)).catch(() => []))
-        .filter((file) => file.endsWith('.json'))
-        .sort()
-        .map((file) => join(branchProposalsDir(home, branch), file));
-}
-export function proposalBasename(path) {
-    return basename(path);
-}