Merge remote-tracking branch 'origin/main' into garrytan/research-goose

# Conflicts:
#	scripts/gen-skill-docs.ts

scripts/resolvers/types.ts

@@ -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 {