CalvinBackup/gstack
1
0
Fork 0
mirror of https://github.com/garrytan/gstack.git synced 2026-05-07 14:06:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve merge conflicts with main (v0.13.6.0)

Browse Source 
Main landed v0.13.5.0 (Factory Droid support) while this branch removes
Factory Droid. Bumped to v0.13.6.0, preserved both 0.13.5.0 and 0.13.4.0
CHANGELOG entries from main history.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-03-29 15:03:07 -07:00
parent 9f88893f5b 484cf1fb3b
commit 7795dd0ee7
51 changed files with 23739 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/resolvers/codex-helpers.ts
+2 -1
View File
@@ -61,7 +61,8 @@ policy:
`;
}
export function codexSkillName(skillDir: string): string {
/** Compute skill name for external hosts (Codex, Factory, etc.) */
export function externalSkillName(skillDir: string): string {
if (skillDir === '.' || skillDir === '') return 'gstack';
// Don't double-prefix: gstack-upgrade → gstack-upgrade (not gstack-gstack-upgrade)
if (skillDir.startsWith('gstack-')) return skillDir;
scripts/resolvers/preamble.ts
+5 -3
View File
@@ -13,12 +13,14 @@ import type { TemplateContext } from './types';
*/
function generatePreambleBash(ctx: TemplateContext): string {
const runtimeRoot = ctx.host === 'codex'
const hostConfigDir: Record<string, string> = { codex: '.codex', factory: '.factory' };
const runtimeRoot = (ctx.host !== 'claude')
? `_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
GSTACK_ROOT="$HOME/.codex/skills/gstack"
[ -n "$_ROOT" ] && [ -d "$_ROOT/.agents/skills/gstack" ] && GSTACK_ROOT="$_ROOT/.agents/skills/gstack"
GSTACK_ROOT="$HOME/${hostConfigDir[ctx.host]}/skills/gstack"
[ -n "$_ROOT" ] && [ -d "$_ROOT/${ctx.paths.localSkillRoot}" ] && GSTACK_ROOT="$_ROOT/${ctx.paths.localSkillRoot}"
GSTACK_BIN="$GSTACK_ROOT/bin"
GSTACK_BROWSE="$GSTACK_ROOT/browse/dist"
GSTACK_DESIGN="$GSTACK_ROOT/design/dist"
`
: '';
scripts/resolvers/types.ts
+8 -1
View File
@@ -1,4 +1,4 @@
export type Host = 'claude' | 'codex';
export type Host = 'claude' | 'codex' | 'factory';
export interface HostPaths {
skillRoot: string;
@@ -23,6 +23,13 @@ export const HOST_PATHS: Record<Host, HostPaths> = {
browseDir: '$GSTACK_BROWSE',
designDir: '$GSTACK_DESIGN',
},
factory: {
skillRoot: '$GSTACK_ROOT',
localSkillRoot: '.factory/skills/gstack',
binDir: '$GSTACK_BIN',
browseDir: '$GSTACK_BROWSE',
designDir: '$GSTACK_DESIGN',
},
};
export interface TemplateContext {
scripts/resolvers/utility.ts
+3
View File
@@ -370,5 +370,8 @@ export function generateCoAuthorTrailer(ctx: TemplateContext): string {
if (ctx.host === 'codex') {
return 'Co-Authored-By: OpenAI Codex <noreply@openai.com>';
}
if (ctx.host === 'factory') {
return 'Co-Authored-By: Factory Droid <droid@users.noreply.github.com>';
}
return 'Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>';
}