@ginkoai/cli 1.4.5 → 1.4.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -13,6 +13,10 @@
|
|
|
13
13
|
* Prefers git repository root for monorepo compatibility,
|
|
14
14
|
* falls back to walking up directory tree
|
|
15
15
|
*
|
|
16
|
+
* IMPORTANT: Distinguishes between:
|
|
17
|
+
* - Global auth: ~/.ginko/ (contains only auth.json)
|
|
18
|
+
* - Project root: <project>/.ginko/ (contains config, sessions, etc.)
|
|
19
|
+
*
|
|
16
20
|
* @param startDir - Directory to start searching from (defaults to cwd)
|
|
17
21
|
* @returns Path to ginko root directory, or null if not found
|
|
18
22
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ginko-root.d.ts","sourceRoot":"","sources":["../../src/utils/ginko-root.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"ginko-root.d.ts","sourceRoot":"","sources":["../../src/utils/ginko-root.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAsEH;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsD7E;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQzE;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGxE;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG3F;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG9F"}
|
package/dist/utils/ginko-root.js
CHANGED
|
@@ -30,37 +30,97 @@ function getGitRoot(startDir) {
|
|
|
30
30
|
return null;
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Check if a .ginko directory is a project root (not just global auth)
|
|
35
|
+
* Project .ginko must contain at least one of: config.yml, ginko.json, or sessions/<user>/
|
|
36
|
+
*
|
|
37
|
+
* CRITICAL: ~/.ginko/ (home directory) is NEVER a project root, only global auth storage
|
|
38
|
+
*
|
|
39
|
+
* @param ginkoPath - Path to .ginko directory
|
|
40
|
+
* @returns true if this is a project .ginko, false if it's global auth or home directory
|
|
41
|
+
*/
|
|
42
|
+
async function isProjectGinko(ginkoPath) {
|
|
43
|
+
try {
|
|
44
|
+
// NEVER treat home directory .ginko as project root (global auth only)
|
|
45
|
+
const homeDir = process.env.HOME || process.env.USERPROFILE || '';
|
|
46
|
+
const homeGinkoPath = path.join(homeDir, '.ginko');
|
|
47
|
+
if (path.resolve(ginkoPath) === path.resolve(homeGinkoPath)) {
|
|
48
|
+
return false; // This is global auth directory, not a project
|
|
49
|
+
}
|
|
50
|
+
// Check for project markers
|
|
51
|
+
const configYml = path.join(ginkoPath, 'config.yml');
|
|
52
|
+
const ginkoJson = path.join(ginkoPath, '../ginko.json'); // Team config at root
|
|
53
|
+
const sessionsDir = path.join(ginkoPath, 'sessions');
|
|
54
|
+
// If config files exist, it's a project
|
|
55
|
+
if (await fs.pathExists(configYml) || await fs.pathExists(ginkoJson)) {
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
// If sessions directory exists with user directories, it's a project
|
|
59
|
+
if (await fs.pathExists(sessionsDir)) {
|
|
60
|
+
const entries = await fs.readdir(sessionsDir);
|
|
61
|
+
// Filter out just 'auth.json' - if there are user session dirs, it's a project
|
|
62
|
+
const nonAuthEntries = entries.filter(e => e !== 'auth.json');
|
|
63
|
+
if (nonAuthEntries.length > 0) {
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
// Only contains auth.json → global auth directory, not a project
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
catch (error) {
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
33
74
|
/**
|
|
34
75
|
* Find the ginko root directory
|
|
35
76
|
* Prefers git repository root for monorepo compatibility,
|
|
36
77
|
* falls back to walking up directory tree
|
|
37
78
|
*
|
|
79
|
+
* IMPORTANT: Distinguishes between:
|
|
80
|
+
* - Global auth: ~/.ginko/ (contains only auth.json)
|
|
81
|
+
* - Project root: <project>/.ginko/ (contains config, sessions, etc.)
|
|
82
|
+
*
|
|
38
83
|
* @param startDir - Directory to start searching from (defaults to cwd)
|
|
39
84
|
* @returns Path to ginko root directory, or null if not found
|
|
40
85
|
*/
|
|
41
86
|
export async function findGinkoRoot(startDir) {
|
|
87
|
+
const start = startDir || process.cwd();
|
|
42
88
|
// First, try to use git repository root (preferred for monorepos)
|
|
43
|
-
const gitRoot = getGitRoot(
|
|
89
|
+
const gitRoot = getGitRoot(start);
|
|
44
90
|
if (gitRoot) {
|
|
45
91
|
const gitGinkoPath = path.join(gitRoot, '.ginko');
|
|
46
92
|
if (await fs.pathExists(gitGinkoPath)) {
|
|
47
93
|
const stats = await fs.stat(gitGinkoPath);
|
|
48
|
-
if (stats.isDirectory()) {
|
|
94
|
+
if (stats.isDirectory() && await isProjectGinko(gitGinkoPath)) {
|
|
49
95
|
return gitRoot;
|
|
50
96
|
}
|
|
51
97
|
}
|
|
52
98
|
}
|
|
53
|
-
// Fall back to walking up directory tree
|
|
54
|
-
let currentDir =
|
|
99
|
+
// Fall back to walking up directory tree, but stop at git boundary
|
|
100
|
+
let currentDir = start;
|
|
55
101
|
const root = path.parse(currentDir).root;
|
|
102
|
+
const homeDir = process.env.HOME || process.env.USERPROFILE || '';
|
|
56
103
|
while (currentDir !== root) {
|
|
57
104
|
const ginkoPath = path.join(currentDir, '.ginko');
|
|
58
105
|
if (await fs.pathExists(ginkoPath)) {
|
|
59
106
|
const stats = await fs.stat(ginkoPath);
|
|
60
|
-
if (stats.isDirectory()) {
|
|
107
|
+
if (stats.isDirectory() && await isProjectGinko(ginkoPath)) {
|
|
61
108
|
return currentDir;
|
|
62
109
|
}
|
|
63
110
|
}
|
|
111
|
+
// Stop at git repository boundary (don't search outside git repo)
|
|
112
|
+
const gitRootHere = getGitRoot(currentDir);
|
|
113
|
+
if (gitRootHere && gitRootHere !== currentDir) {
|
|
114
|
+
// We're inside a git repo but not at its root, keep going up to git root
|
|
115
|
+
}
|
|
116
|
+
else if (gitRootHere === currentDir) {
|
|
117
|
+
// We're at git root and no .ginko found
|
|
118
|
+
break;
|
|
119
|
+
}
|
|
120
|
+
// Don't search above home directory (stops at ~/.ginko global auth)
|
|
121
|
+
if (homeDir && currentDir === homeDir) {
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
64
124
|
// Move up one directory
|
|
65
125
|
const parentDir = path.dirname(currentDir);
|
|
66
126
|
if (parentDir === currentDir) {
|
|
@@ -69,14 +129,6 @@ export async function findGinkoRoot(startDir) {
|
|
|
69
129
|
}
|
|
70
130
|
currentDir = parentDir;
|
|
71
131
|
}
|
|
72
|
-
// Check the root directory itself
|
|
73
|
-
const rootGinkoPath = path.join(root, '.ginko');
|
|
74
|
-
if (await fs.pathExists(rootGinkoPath)) {
|
|
75
|
-
const stats = await fs.stat(rootGinkoPath);
|
|
76
|
-
if (stats.isDirectory()) {
|
|
77
|
-
return root;
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
132
|
return null;
|
|
81
133
|
}
|
|
82
134
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ginko-root.js","sourceRoot":"","sources":["../../src/utils/ginko-root.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC;;;;;GAKG;AACH,SAAS,UAAU,CAAC,QAAiB;IACnC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,QAAQ,CAAC,+BAA+B,EAAE;YACxD,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE;YAC9B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,kBAAkB;SACrD,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"ginko-root.js","sourceRoot":"","sources":["../../src/utils/ginko-root.ts"],"names":[],"mappings":"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"}
|