@stigmer/cli 3.15.3-dev.20260916211208 → 3.16.1-dev.20260917224426

package/resources/ignore/index.js

@@ -1,6 +1,6 @@
-// Public surface of the gitignore-compatible ignore engine.
-export { DEFAULT_PATTERNS } from "./defaults.js";
-export { matchName } from "./match.js";
-export { createMatcher, Matcher, Reason, REASON_TEXT, SOURCE_CLI, SOURCE_DEFAULTS, SOURCE_GITIGNORE, SOURCE_STIGMERIGNORE, } from "./matcher.js";
-export { MatchResult, parsePattern } from "./pattern.js";
+// Public surface of the CLI's ignore edge. The engine is
+// `@stigmer/plugin-package/client`; re-exported here so the CLI's callers keep
+// one import path and the shared engine stays the only implementation.
+export { DEFAULT_PATTERNS, MatchResult, Matcher, REASON_TEXT, Reason, SOURCE_CLI, SOURCE_DEFAULTS, SOURCE_GITIGNORE, SOURCE_STIGMERIGNORE, matchName, parsePattern, } from "@stigmer/plugin-package/client";
+export { createMatcher } from "./matcher.js";
 //# sourceMappingURL=index.js.map

package/resources/ignore/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resources/ignore/index.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EACL,aAAa,EAGb,OAAO,EACP,MAAM,EACN,WAAW,EACX,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAgB,YAAY,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resources/ignore/index.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,+EAA+E;AAC/E,uEAAuE;AAEvE,OAAO,EACL,gBAAgB,EAEhB,WAAW,EACX,OAAO,EAEP,WAAW,EACX,MAAM,EACN,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,SAAS,EACT,YAAY,GACb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,aAAa,EAAuB,MAAM,cAAc,CAAC"}

package/resources/ignore/matcher.d.ts

@@ -1,26 +1,4 @@
-import { type Pattern } from "./pattern.js";
-export declare const SOURCE_DEFAULTS = "defaults";
-export declare const SOURCE_GITIGNORE = ".gitignore";
-export declare const SOURCE_STIGMERIGNORE = ".stigmerignore";
-export declare const SOURCE_CLI = "cli";
-export declare enum Reason {
-    NoMatch = 0,
-    Excluded = 1,
-    Included = 2,
-    DefaultDeny = 3
-}
-export declare const REASON_TEXT: Readonly<Record<Reason, string>>;
-export interface MatchReason {
-    readonly ignored: boolean;
-    readonly reason: Reason;
-    readonly source: string;
-    readonly pattern: string;
-}
-interface PatternEntry {
-    readonly pattern: Pattern;
-    readonly source: string;
-    readonly raw: string;
-}
+import { type Matcher } from "@stigmer/plugin-package/client";
 export interface MatcherOptions {
     readonly rootDir: string;
     readonly respectGitignore: boolean;
@@ -28,17 +6,6 @@ export interface MatcherOptions {
     readonly extraIgnore?: readonly string[];
     readonly extraInclude?: readonly string[];
 }
-export declare class Matcher {
-    private readonly entries;
-    constructor(entries: readonly PatternEntry[]);
-    /** Decide whether a path (relative, forward-slash) is ignored, with reason. */
-    matchWithReason(path: string, isDir: boolean): MatchReason;
-    /** Whether the path should be excluded from the artifact. */
-    match(path: string, isDir: boolean): boolean;
-    /** All loaded patterns as "[source] pattern" (for dry-run diagnostics). */
-    patterns(): string[];
-}
-/** Build a Matcher for `rootDir`, loading the configured pattern sources. */
+/** Build a Matcher for `rootDir`, loading the configured pattern sources from disk. */
 export declare function createMatcher(options: MatcherOptions): Matcher;
-export {};
 //# sourceMappingURL=matcher.d.ts.map

package/resources/ignore/matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../../../src/resources/ignore/matcher.ts"],"names":[],"mappings":"AAOA,OAAO,EAAe,KAAK,OAAO,EAAgB,MAAM,cAAc,CAAC;AAEvE,eAAO,MAAM,eAAe,aAAa,CAAC;AAC1C,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAC7C,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AACrD,eAAO,MAAM,UAAU,QAAQ,CAAC;AAEhC,oBAAY,MAAM;IAChB,OAAO,IAAI;IACX,QAAQ,IAAI;IACZ,QAAQ,IAAI;IACZ,WAAW,IAAI;CAChB;AAED,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAKxD,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3C;AAED,qBAAa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;gBAEtC,OAAO,EAAE,SAAS,YAAY,EAAE;IAI5C,+EAA+E;IAC/E,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,WAAW;IA4B1D,6DAA6D;IAC7D,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO;IAI5C,2EAA2E;IAC3E,QAAQ,IAAI,MAAM,EAAE;CAGrB;AAED,6EAA6E;AAC7E,wBAAgB,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAqB9D"}
+{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../../../src/resources/ignore/matcher.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,KAAK,OAAO,EAIb,MAAM,gCAAgC,CAAC;AAExC,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3C;AAED,uFAAuF;AACvF,wBAAgB,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAiB9D"}

package/resources/ignore/matcher.js

@@ -1,125 +1,41 @@
-// Ignore matcher: composes pattern sources with gitignore precedence (defaults
-// → .gitignore → .stigmerignore → CLI flags), evaluating "last match wins".
-// A faithful port of the Go CLI's pkg/ignore Matcher.
+// The CLI's edge for the shared ignore engine: read the ignore files from the
+// directory about to be packaged and build the matcher from their text.
+//
+// The engine itself (patterns, precedence, last-match-wins, the security
+// defaults) lives in `@stigmer/plugin-package/client`, where the console
+// builds the same matcher from a marketplace tree's file list. What is left
+// here is what only a filesystem client needs: which files to read and that
+// an absent or unreadable ignore file is normal and contributes nothing.
 import { readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
-import { DEFAULT_PATTERNS } from "./defaults.js";
-import { MatchResult, parsePattern } from "./pattern.js";
-export const SOURCE_DEFAULTS = "defaults";
-export const SOURCE_GITIGNORE = ".gitignore";
-export const SOURCE_STIGMERIGNORE = ".stigmerignore";
-export const SOURCE_CLI = "cli";
-export var Reason;
-(function (Reason) {
-    Reason[Reason["NoMatch"] = 0] = "NoMatch";
-    Reason[Reason["Excluded"] = 1] = "Excluded";
-    Reason[Reason["Included"] = 2] = "Included";
-    Reason[Reason["DefaultDeny"] = 3] = "DefaultDeny";
-})(Reason || (Reason = {}));
-export const REASON_TEXT = {
-    [Reason.NoMatch]: "no pattern matched",
-    [Reason.Excluded]: "excluded by pattern",
-    [Reason.Included]: "included by negation pattern",
-    [Reason.DefaultDeny]: "excluded by security default",
-};
-export class Matcher {
-    entries;
-    constructor(entries) {
-        this.entries = entries;
-    }
-    /** Decide whether a path (relative, forward-slash) is ignored, with reason. */
-    matchWithReason(path, isDir) {
-        const components = pathToComponents(path);
-        if (components.length === 0) {
-            return { ignored: false, reason: Reason.NoMatch, source: "", pattern: "" };
-        }
-        let lastMatch;
-        let lastResult = MatchResult.NoMatch;
-        for (const entry of this.entries) {
-            const result = entry.pattern.match(components, isDir);
-            if (result !== MatchResult.NoMatch) {
-                lastMatch = entry;
-                lastResult = result;
-            }
-        }
-        if (lastMatch === undefined) {
-            return { ignored: false, reason: Reason.NoMatch, source: "", pattern: "" };
-        }
-        if (lastResult === MatchResult.Exclude) {
-            const reason = lastMatch.source === SOURCE_DEFAULTS ? Reason.DefaultDeny : Reason.Excluded;
-            return { ignored: true, reason, source: lastMatch.source, pattern: lastMatch.raw };
-        }
-        // Include (negation): explicitly un-ignored.
-        return { ignored: false, reason: Reason.Included, source: lastMatch.source, pattern: lastMatch.raw };
-    }
-    /** Whether the path should be excluded from the artifact. */
-    match(path, isDir) {
-        return this.matchWithReason(path, isDir).ignored;
-    }
-    /** All loaded patterns as "[source] pattern" (for dry-run diagnostics). */
-    patterns() {
-        return this.entries.map((entry) => `[${entry.source}] ${entry.raw}`);
-    }
-}
-/** Build a Matcher for `rootDir`, loading the configured pattern sources. */
+import { SOURCE_GITIGNORE, SOURCE_STIGMERIGNORE, buildMatcher, } from "@stigmer/plugin-package/client";
+/** Build a Matcher for `rootDir`, loading the configured pattern sources from disk. */
 export function createMatcher(options) {
     if (options.rootDir === "")
         throw new Error("rootDir is required");
     const stat = statSync(options.rootDir);
     if (!stat.isDirectory())
         throw new Error(`rootDir is not a directory: ${options.rootDir}`);
-    const entries = [];
-    if (options.includeDefaults) {
-        entries.push(...parseEntries(DEFAULT_PATTERNS, SOURCE_DEFAULTS));
-    }
-    if (options.respectGitignore) {
-        entries.push(...loadIgnoreFile(join(options.rootDir, ".gitignore"), SOURCE_GITIGNORE));
-    }
-    entries.push(...loadIgnoreFile(join(options.rootDir, ".stigmerignore"), SOURCE_STIGMERIGNORE));
-    const extraIgnore = options.extraIgnore ?? [];
-    const extraInclude = options.extraInclude ?? [];
-    if (extraIgnore.length > 0 || extraInclude.length > 0) {
-        entries.push(...loadCliPatterns(extraIgnore, extraInclude));
-    }
-    return new Matcher(entries);
-}
-function parseEntries(patterns, source) {
-    const entries = [];
-    for (const raw of patterns) {
-        const trimmed = raw.trim();
-        if (trimmed === "" || trimmed.startsWith("#"))
-            continue;
-        entries.push({ pattern: parsePattern(trimmed, []), source, raw: trimmed });
-    }
-    return entries;
+    const gitignore = options.respectGitignore
+        ? readIgnoreFile(join(options.rootDir, SOURCE_GITIGNORE))
+        : undefined;
+    const stigmerignore = readIgnoreFile(join(options.rootDir, SOURCE_STIGMERIGNORE));
+    const sources = {
+        includeDefaults: options.includeDefaults,
+        ...(gitignore !== undefined && { gitignore }),
+        ...(stigmerignore !== undefined && { stigmerignore }),
+        ...(options.extraIgnore !== undefined && { extraIgnore: options.extraIgnore }),
+        ...(options.extraInclude !== undefined && { extraInclude: options.extraInclude }),
+    };
+    return buildMatcher(sources);
 }
-function loadIgnoreFile(path, source) {
-    let text;
+function readIgnoreFile(path) {
     try {
-        text = readFileSync(path, "utf8");
+        return readFileSync(path, "utf8");
     }
     catch {
         // Absent or unreadable ignore files are normal — no patterns.
-        return [];
+        return undefined;
     }
-    return parseEntries(text.split(/\r?\n/), source);
-}
-function loadCliPatterns(ignore, include) {
-    const entries = parseEntries(ignore, SOURCE_CLI);
-    const negations = [];
-    for (const pattern of include) {
-        const trimmed = pattern.trim();
-        if (trimmed === "")
-            continue;
-        negations.push(trimmed.startsWith("!") ? trimmed : `!${trimmed}`);
-    }
-    entries.push(...parseEntries(negations, SOURCE_CLI));
-    return entries;
-}
-function pathToComponents(path) {
-    const normalized = path.replace(/\\/g, "/").replace(/^\.\//, "");
-    if (normalized === "" || normalized === ".")
-        return [];
-    return normalized.split("/");
 }
 //# sourceMappingURL=matcher.js.map

package/resources/ignore/matcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../../../src/resources/ignore/matcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../../../src/resources/ignore/matcher.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,wEAAwE;AACxE,EAAE;AACF,yEAAyE;AACzE,yEAAyE;AACzE,4EAA4E;AAC5E,4EAA4E;AAC5E,yEAAyE;AAEzE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAGL,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,GACb,MAAM,gCAAgC,CAAC;AAUxC,uFAAuF;AACvF,MAAM,UAAU,aAAa,CAAC,OAAuB;IACnD,IAAI,OAAO,CAAC,OAAO,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE3F,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB;QACxC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACzD,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAClF,MAAM,OAAO,GAAkB;QAC7B,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,GAAG,CAAC,aAAa,KAAK,SAAS,IAAI,EAAE,aAAa,EAAE,CAAC;QACrD,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;QAC9E,GAAG,CAAC,OAAO,CAAC,YAAY,KAAK,SAAS,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC;KAClF,CAAC;IACF,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,8DAA8D;QAC9D,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}

package/resources/plugin.d.ts

@@ -1,4 +1,5 @@
-import { type PluginDialect, type PluginFiles, type PluginFinding, type PluginPackage } from "@stigmer/plugin-package";
+import { type PluginFiles, type PluginFinding, type PluginPackage } from "@stigmer/plugin-package";
+import { DIALECT_LABELS } from "@stigmer/plugin-package/client";
 import { type Plugin } from "@stigmer/protos/ai/stigmer/agentic/plugin/v1/api_pb";
 import { type PluginMember } from "@stigmer/protos/ai/stigmer/agentic/plugin/v1/io_pb";
 import type { ApiResourceVisibility } from "@stigmer/protos/ai/stigmer/commons/apiresource/enum_pb";
@@ -6,6 +7,7 @@ import type { Stigmer } from "@stigmer/sdk";
 import { UsageError } from "../errors/index.js";
 import { CommandResult } from "../output/index.js";
 import { type IgnoreOptions, type ZipStats } from "./skill.js";
+export { DIALECT_LABELS };
 /** The four manifest locations; a directory holding any of them is a plugin. */
 export declare const PLUGIN_MANIFEST_PATHS: readonly string[];
 /** True when `path` is a directory holding one of the four plugin manifests. */
@@ -17,7 +19,14 @@ export interface PluginDirectory {
 }
 /** Validate's ignore posture: the defaults and the directory's own ignore files, no flags. */
 export declare const DEFAULT_IGNORE_OPTIONS: IgnoreOptions;
-/** Walk `dir` through the ignore matcher into a `PluginFiles`. */
+/**
+ * List the files under `dir` and select through the shared rule. The walk
+ * prunes a directory the matcher ignores before descending (a
+ * `node_modules/` is never stat'ed), and the selection applies the same
+ * matcher to what remains, so the CLI and the console agree on every
+ * decision and only the CLI pays the filesystem. Symlinks are neither
+ * files nor directories to `readdirSync` and are never followed.
+ */
 export declare function readPluginDirectory(dir: string, options?: IgnoreOptions): PluginDirectory;
 /** The `--json` payload: the package with overlay documents as paths, plus the findings. */
 export interface PluginDescription {
@@ -38,8 +47,6 @@ export interface PluginDescription {
     readonly excludedFiles: number;
 }
 export declare function describePlugin(plugin: PluginPackage, warnings: readonly PluginFinding[], stats: ZipStats): PluginDescription;
-/** Human labels for the four dialects, in the vocabulary the docs use. */
-export declare const DIALECT_LABELS: Readonly<Record<PluginDialect, string>>;
 /** The library's refusal as the CLI's one UsageError: every problem, then every warning. */
 export declare function pluginRefusal(dir: string, errors: readonly PluginFinding[], warnings: readonly PluginFinding[]): UsageError;
 /**
@@ -50,17 +57,41 @@ export declare function pluginRefusal(dir: string, errors: readonly PluginFindin
 export declare function describePackageOn(result: CommandResult, plugin: PluginPackage, warnings: readonly PluginFinding[], stats: ZipStats): CommandResult;
 export declare function count(n: number, noun: string): string;
 /**
- * The archive a push sends: the SAME file list `validate` read, zipped
- * deterministically (sorted entries, one DOS-epoch mtime, the skill
- * packager's level), so the digest the server records is a pure function
- * of the plugin's content and a second push of an unchanged directory is
- * the server's no-op.
+ * A plugin directory read, validated and zipped, but not yet pushed. The
+ * step between "a folder" and "a push" is its own value because two callers
+ * need to look at it first: `push plugin --dry-run` prints it, and `stigmer
+ * up` compares `digest` with what the server already holds before deciding
+ * whether a push is needed at all.
+ */
+export interface PreparedPluginPush {
+    /** The directory that was read, for sentences. */
+    readonly dir: string;
+    readonly files: PluginFiles;
+    readonly stats: ZipStats;
+    readonly plugin: PluginPackage;
+    readonly warnings: readonly PluginFinding[];
+    /** The exact bytes a push sends. */
+    readonly archive: Uint8Array;
+    /**
+     * SHA-256 of `archive`, lowercase hex: the identity the server records as
+     * `status.digest` (its digest is over the bytes it receives, and these are
+     * those bytes), so a client can know "already installed" without pushing.
+     */
+    readonly digest: string;
+}
+/**
+ * Read and validate offline (the same refusal `validate` prints, before a
+ * byte moves), then zip. The server re-validates with the same library; the
+ * offline pass exists so an author never waits on the network to hear a
+ * sentence the CLI could say.
  */
-export declare function zipPluginFiles(files: PluginFiles): Uint8Array;
-export interface PushPluginOptions {
+export declare function preparePluginPush(dir: string, ignoreOptions?: IgnoreOptions): Promise<PreparedPluginPush>;
+export interface PushPreparedOptions {
     readonly org: string;
     readonly visibility: ApiResourceVisibility | undefined;
     readonly message: string;
+}
+export interface PushPluginOptions extends PushPreparedOptions {
     readonly ignoreOptions: IgnoreOptions;
 }
 export interface PushPluginOutcome {
@@ -68,13 +99,14 @@ export interface PushPluginOutcome {
     readonly members: readonly PluginMember[];
     readonly archiveBytes: number;
 }
-/**
- * Read, validate offline (the same refusal `validate` prints, before a byte
- * moves), zip, push, then read the members back. The server re-validates
- * with the same library; the offline pass exists so an author never waits
- * on the network to hear a sentence the CLI could say.
- */
+/** Push a prepared archive, then read the members back for the install summary. */
+export declare function pushPrepared(client: Stigmer, prepared: PreparedPluginPush, options: PushPreparedOptions): Promise<PushPluginOutcome>;
+/** `push plugin <dir>` in one call: prepare, then push. */
 export declare function pushPlugin(client: Stigmer, dir: string, options: PushPluginOptions): Promise<PushPluginOutcome>;
+export interface RenderPushOptions {
+    /** Where the archive came from when it was not a folder: the marketplace's name and source. */
+    readonly installedFrom?: string;
+}
 /** The install as the user reads it: what landed, what was skipped, what to know. */
-export declare function renderPushOutcome(outcome: PushPluginOutcome): CommandResult;
+export declare function renderPushOutcome(outcome: PushPluginOutcome, options?: RenderPushOptions): CommandResult;
 //# sourceMappingURL=plugin.d.ts.map

package/resources/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/resources/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/resources/plugin.ts"],"names":[],"mappings":"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"}

package/resources/plugin.js

@@ -2,28 +2,32 @@
 // something the CLI can print.
 //
 // `@stigmer/plugin-package` is pure over a `PluginFiles` list; this module is
-// the CLI's edge for it. The walk is the skill packager's discipline
-// (`createSkillZip`): sorted entries, symlinks never followed, the same
-// gitignore-compatible matcher deciding inclusion, so what `validate` reads
-// is exactly what a push of the same directory would package. Sizes come
-// from `stat` so the library can refuse an over-cap document before reading
-// it; the library re-checks the bytes it gets back.
+// the CLI's edge for it. The walk lists every file under the directory
+// (symlinks never followed, sizes from `stat` so the library can refuse an
+// over-cap document before reading it) and hands the list to the shared
+// selection rule in `@stigmer/plugin-package/client`, which decides
+// inclusion and order the same way for every client: what `validate` reads
+// here is exactly what a push of the same directory packages, and exactly
+// what the console packages from the same tree on a marketplace host.
 //
 // `describePlugin` is the JSON projection for `--json`: the normalised
 // package with overlay documents reduced to their paths (the bytes are the
 // user's own files, and a byte array serialises badly).
 //
-// The push half: the same walked file list, zipped the way the skill
-// packager zips (deterministic bytes, so the server's digest is a function
-// of content), pushed through the SDK's routed plugin client, and the
-// members read back for the install summary. `validate -f`, `push plugin
-// --dry-run` and `push plugin` share one description renderer so the
-// author reads one vocabulary at every step.
+// The push half is two steps with a value between them: `preparePluginPush`
+// (the same selected file list, archived and digested by the shared module,
+// so the bytes and their SHA-256 are a function of content alone and equal
+// what the console computes for the same tree) and `pushPrepared` (the SDK's
+// routed plugin client, then the members read back for the install summary). The value in between is what `push plugin
+// --dry-run` prints, what `stigmer install` pushes from a marketplace entry,
+// and what `stigmer up` compares with the server's digest before deciding
+// to push. `validate -f`, `push plugin --dry-run` and `push plugin` share one
+// description renderer so the author reads one vocabulary at every step.
 import { readdirSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { create, toJson } from "@bufbuild/protobuf";
-import { zipSync } from "fflate";
 import { MANIFEST_LOCATIONS, readPluginPackage, } from "@stigmer/plugin-package";
+import { DIALECT_LABELS, archivePlugin, digestArchive, selectPluginFiles, } from "@stigmer/plugin-package/client";
 import { PluginSchema, } from "@stigmer/protos/ai/stigmer/agentic/plugin/v1/api_pb";
 import { PluginMemberSchema, PushPluginRequestSchema, } from "@stigmer/protos/ai/stigmer/agentic/plugin/v1/io_pb";
 import { PluginDialect as PluginDialectProto } from "@stigmer/protos/ai/stigmer/agentic/plugin/v1/spec_pb";
@@ -31,7 +35,8 @@ import { ApiResourceKind } from "@stigmer/protos/ai/stigmer/commons/apiresource/
 import { UsageError } from "../errors/index.js";
 import { CommandResult } from "../output/index.js";
 import { createMatcher } from "./ignore/index.js";
-import { DETERMINISTIC_ZIP_MTIME, formatBytes, shortHash, } from "./skill.js";
+import { formatBytes, shortHash, } from "./skill.js";
+export { DIALECT_LABELS };
 /** The four manifest locations; a directory holding any of them is a plugin. */
 export const PLUGIN_MANIFEST_PATHS = Object.values(MANIFEST_LOCATIONS);
 /** True when `path` is a directory holding one of the four plugin manifests. */
@@ -58,7 +63,14 @@ export const DEFAULT_IGNORE_OPTIONS = {
     extraIgnore: [],
     extraInclude: [],
 };
-/** Walk `dir` through the ignore matcher into a `PluginFiles`. */
+/**
+ * List the files under `dir` and select through the shared rule. The walk
+ * prunes a directory the matcher ignores before descending (a
+ * `node_modules/` is never stat'ed), and the selection applies the same
+ * matcher to what remains, so the CLI and the console agree on every
+ * decision and only the CLI pays the filesystem. Symlinks are neither
+ * files nor directories to `readdirSync` and are never followed.
+ */
 export function readPluginDirectory(dir, options = DEFAULT_IGNORE_OPTIONS) {
     const matcher = createMatcher({
         rootDir: dir,
@@ -67,46 +79,37 @@ export function readPluginDirectory(dir, options = DEFAULT_IGNORE_OPTIONS) {
         extraIgnore: options.extraIgnore,
         extraInclude: options.extraInclude,
     });
-    const stats = {
-        filesIncluded: 0,
-        filesIgnored: 0,
-        dirsSkipped: 0,
-        totalSize: 0,
-    };
-    const entries = [];
+    let dirsSkipped = 0;
+    const candidates = [];
     const walk = (currentDir, prefix) => {
-        const dirents = readdirSync(currentDir, { withFileTypes: true }).sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
-        for (const dirent of dirents) {
+        for (const dirent of readdirSync(currentDir, { withFileTypes: true })) {
             const relPath = prefix === "" ? dirent.name : `${prefix}/${dirent.name}`;
-            const full = join(currentDir, dirent.name);
             if (dirent.isDirectory()) {
-                if (matcher.matchWithReason(relPath, true).ignored) {
-                    stats.dirsSkipped++;
+                if (matcher.match(relPath, true)) {
+                    dirsSkipped++;
                     continue;
                 }
-                walk(full, relPath);
+                walk(join(currentDir, dirent.name), relPath);
                 continue;
             }
-            // Symlinks are neither files nor directories here and are never followed.
             if (!dirent.isFile())
                 continue;
-            if (matcher.matchWithReason(relPath, false).ignored) {
-                stats.filesIgnored++;
-                continue;
-            }
-            const size = statSync(full).size;
-            entries.push({ path: relPath, size });
-            stats.filesIncluded++;
-            stats.totalSize += size;
+            candidates.push({
+                path: relPath,
+                size: statSync(join(currentDir, dirent.name)).size,
+            });
         }
     };
     walk(dir, "");
+    const read = (path) => new Uint8Array(readFileSync(join(dir, ...path.split("/"))));
+    const selection = selectPluginFiles(candidates, read, {
+        respectGitignore: options.respectGitignore,
+        extraIgnore: options.extraIgnore,
+        extraInclude: options.extraInclude,
+    });
     return {
-        files: {
-            entries,
-            read: (path) => new Uint8Array(readFileSync(join(dir, ...path.split("/")))),
-        },
-        stats,
+        files: selection.files,
+        stats: { ...selection.stats, dirsSkipped },
     };
 }
 export function describePlugin(plugin, warnings, stats) {
@@ -131,13 +134,6 @@ export function describePlugin(plugin, warnings, stats) {
     };
 }
 // ─── Rendering, shared by `validate -f <dir>` and `push plugin --dry-run` ────
-/** Human labels for the four dialects, in the vocabulary the docs use. */
-export const DIALECT_LABELS = {
-    "agent-plugins": "Agent Plugins 1.0",
-    claude: "Claude Code plugin",
-    cursor: "Cursor plugin",
-    codex: "Codex plugin",
-};
 /** The library's refusal as the CLI's one UsageError: every problem, then every warning. */
 export function pluginRefusal(dir, errors, warnings) {
     const lines = [
@@ -192,37 +188,34 @@ export function count(n, noun) {
 function named(items) {
     return items.length === 0 ? "none" : `${items.length}: ${items.join(", ")}`;
 }
-// ─── Push ────────────────────────────────────────────────────────────────
 /**
- * The archive a push sends: the SAME file list `validate` read, zipped
- * deterministically (sorted entries, one DOS-epoch mtime, the skill
- * packager's level), so the digest the server records is a pure function
- * of the plugin's content and a second push of an unchanged directory is
- * the server's no-op.
+ * Read and validate offline (the same refusal `validate` prints, before a
+ * byte moves), then zip. The server re-validates with the same library; the
+ * offline pass exists so an author never waits on the network to hear a
+ * sentence the CLI could say.
  */
-export function zipPluginFiles(files) {
-    const tree = {};
-    for (const entry of files.entries) {
-        tree[entry.path] = files.read(entry.path);
-    }
-    return zipSync(tree, { level: 6, mtime: DETERMINISTIC_ZIP_MTIME });
-}
-/**
- * Read, validate offline (the same refusal `validate` prints, before a byte
- * moves), zip, push, then read the members back. The server re-validates
- * with the same library; the offline pass exists so an author never waits
- * on the network to hear a sentence the CLI could say.
- */
-export async function pushPlugin(client, dir, options) {
-    const directory = readPluginDirectory(dir, options.ignoreOptions);
+export async function preparePluginPush(dir, ignoreOptions = DEFAULT_IGNORE_OPTIONS) {
+    const directory = readPluginDirectory(dir, ignoreOptions);
     const outcome = readPluginPackage(directory.files);
     if (!outcome.ok) {
         throw pluginRefusal(dir, outcome.errors, outcome.warnings);
     }
-    const archive = zipPluginFiles(directory.files);
+    const archive = archivePlugin(directory.files);
+    return {
+        dir,
+        files: directory.files,
+        stats: directory.stats,
+        plugin: outcome.plugin,
+        warnings: outcome.warnings,
+        archive,
+        digest: await digestArchive(archive),
+    };
+}
+/** Push a prepared archive, then read the members back for the install summary. */
+export async function pushPrepared(client, prepared, options) {
     const plugin = await client.plugin.push(create(PushPluginRequestSchema, {
         org: options.org,
-        artifact: archive,
+        artifact: prepared.archive,
         message: options.message,
         ...(options.visibility !== undefined && {
             visibility: options.visibility,
@@ -230,10 +223,14 @@ export async function pushPlugin(client, dir, options) {
     }));
     const members = (await client.plugin.listMembers(plugin.metadata?.id ?? ""))
         .members;
-    return { plugin, members, archiveBytes: archive.length };
+    return { plugin, members, archiveBytes: prepared.archive.length };
+}
+/** `push plugin <dir>` in one call: prepare, then push. */
+export async function pushPlugin(client, dir, options) {
+    return pushPrepared(client, await preparePluginPush(dir, options.ignoreOptions), options);
 }
 /** The install as the user reads it: what landed, what was skipped, what to know. */
-export function renderPushOutcome(outcome) {
+export function renderPushOutcome(outcome, options = {}) {
     const { plugin, members } = outcome;
     const warnings = plugin.status?.warnings ?? [];
     const counts = plugin.status?.materialized;
@@ -257,6 +254,8 @@ export function renderPushOutcome(outcome) {
     about.field("Digest", shortHash(plugin.status?.digest ?? ""));
     about.field("Format", plugin.spec === undefined ? "" : dialectLabel(plugin.spec.dialect));
     about.field("Size", formatBytes(outcome.archiveBytes));
+    if (options.installedFrom !== undefined)
+        about.field("Marketplace", options.installedFrom);
     const installed = result.addSection("Installed");
     for (const kind of [
         ApiResourceKind.skill,