@knpkv/confluence-to-markdown 0.6.0 → 0.7.0

package/dist/internal/tokenStorage.js

@@ -3,32 +3,42 @@
  *
  * @module
  */
-import * as FileSystem from "@effect/platform/FileSystem";
-import * as Path from "@effect/platform/Path";
+import * as Config from "effect/Config";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
 import { FileSystemError } from "../ConfluenceError.js";
 import { OAuthConfigSchema, OAuthTokenSchema } from "../Schemas.js";
 const TOKEN_DIR_NAME = ".confluence";
 const TOKEN_FILE_NAME = "auth.json";
 const CONFIG_FILE_NAME = "config.json";
+const parseJsonOrNull = (content) => {
+    try {
+        return JSON.parse(content);
+    }
+    catch {
+        return null;
+    }
+};
 /**
  * Tag for the HomeDirectory service.
  *
  * @category Services
  */
-export class HomeDirectoryTag extends Context.Tag("@knpkv/confluence-to-markdown/HomeDirectory")() {
+export class HomeDirectoryTag extends Context.Service()("@knpkv/confluence-to-markdown/HomeDirectory") {
 }
 /**
- * Default implementation using process.env.HOME.
+ * Default implementation using Effect Config.
  *
  * @category Layers
  */
-export const HomeDirectoryLive = Layer.succeed(HomeDirectoryTag, {
-    get: () => Effect.sync(() => process.env.HOME ?? process.env.USERPROFILE ?? "/")
-});
+const homeDirectoryPath = Config.string("HOME").pipe(Config.orElse(() => Config.string("USERPROFILE")), Config.orElse(() => Config.succeed("/")));
+export const HomeDirectoryLive = Layer.effect(HomeDirectoryTag, homeDirectoryPath.pipe(Effect.catchCause(() => Effect.succeed("/")), Effect.map((home) => HomeDirectoryTag.of({
+    get: () => Effect.succeed(home)
+}))));
 /**
  * Get the token directory path.
  */
@@ -64,19 +74,15 @@ const getConfigPath = () => Effect.gen(function* () {
 export const loadToken = () => Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const tokenPath = yield* getTokenPath();
-    const exists = yield* fs.exists(tokenPath).pipe(Effect.catchAll(() => Effect.succeed(false)));
+    const exists = yield* fs.exists(tokenPath).pipe(Effect.catchCause(() => Effect.succeed(false)));
     if (!exists) {
         return null;
     }
     const content = yield* fs.readFileString(tokenPath).pipe(Effect.mapError((cause) => new FileSystemError({ operation: "read", path: tokenPath, cause })));
-    let parsed;
-    try {
-        parsed = JSON.parse(content);
-    }
-    catch {
+    const parsed = yield* Effect.sync(() => parseJsonOrNull(content));
+    if (parsed === null)
         return null;
-    }
-    const decoded = yield* Schema.decodeUnknown(OAuthTokenSchema)(parsed).pipe(Effect.catchAll(() => Effect.succeed(null)));
+    const decoded = yield* Schema.decodeUnknownEffect(OAuthTokenSchema)(parsed).pipe(Effect.catchCause(() => Effect.succeed(null)));
     return decoded;
 });
 /**
@@ -103,7 +109,7 @@ export const saveToken = (token) => Effect.gen(function* () {
 export const deleteToken = () => Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const tokenPath = yield* getTokenPath();
-    yield* fs.remove(tokenPath).pipe(Effect.catchAll(() => Effect.void), Effect.mapError((cause) => new FileSystemError({ operation: "delete", path: tokenPath, cause })));
+    yield* fs.remove(tokenPath).pipe(Effect.catchCause(() => Effect.void));
 });
 /**
  * Load OAuth client configuration from disk.
@@ -115,19 +121,15 @@ export const deleteToken = () => Effect.gen(function* () {
 export const loadOAuthConfig = () => Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const configPath = yield* getConfigPath();
-    const exists = yield* fs.exists(configPath).pipe(Effect.catchAll(() => Effect.succeed(false)));
+    const exists = yield* fs.exists(configPath).pipe(Effect.catchCause(() => Effect.succeed(false)));
     if (!exists) {
         return null;
     }
     const content = yield* fs.readFileString(configPath).pipe(Effect.mapError((cause) => new FileSystemError({ operation: "read", path: configPath, cause })));
-    let parsed;
-    try {
-        parsed = JSON.parse(content);
-    }
-    catch {
+    const parsed = yield* Effect.sync(() => parseJsonOrNull(content));
+    if (parsed === null)
         return null;
-    }
-    const decoded = yield* Schema.decodeUnknown(OAuthConfigSchema)(parsed).pipe(Effect.catchAll(() => Effect.succeed(null)));
+    const decoded = yield* Schema.decodeUnknownEffect(OAuthConfigSchema)(parsed).pipe(Effect.catchCause(() => Effect.succeed(null)));
     return decoded;
 });
 /**

package/dist/internal/tokenStorage.js.map

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

package/dist/internal/userCache.d.ts

@@ -7,7 +7,7 @@ import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import type { AtlassianUser } from "../Schemas.js";
-declare const UserCache_base: Context.TagClass<UserCache, "@knpkv/confluence-to-markdown/UserCache", {
+declare const UserCache_base: Context.ServiceClass<UserCache, "@knpkv/confluence-to-markdown/UserCache", {
     /**
      * Get user from cache, or fetch and cache if not present.
      */

package/dist/internal/userCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCache.d.ts","sourceRoot":"","sources":["../../src/internal/userCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;;IAU9C;;OAEG;yBACkB,CACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,KAChE,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC;IAE1C;;OAEG;kBACW,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,GAAG,SAAS,CAAC;IAE7E;;OAEG;kBACW,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;IAE7E;;OAEG;oBACa,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;;AA7B7C;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cA0B5B;CAAG;AA0CN;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAiC,CAAA"}
+{"version":3,"file":"userCache.d.ts","sourceRoot":"","sources":["../../src/internal/userCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;;IAU9C;;OAEG;yBACkB,CACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,KAChE,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC;IAE1C;;OAEG;kBACW,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,GAAG,SAAS,CAAC;IAE7E;;OAEG;kBACW,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;IAE7E;;OAEG;oBACa,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;;AA7B7C;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cA0Be;CAAG;AA0CjD;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAiC,CAAA"}

package/dist/internal/userCache.js

@@ -12,7 +12,7 @@ import * as Ref from "effect/Ref";
  *
  * @category Cache
  */
-export class UserCache extends Context.Tag("@knpkv/confluence-to-markdown/UserCache")() {
+export class UserCache extends Context.Service()("@knpkv/confluence-to-markdown/UserCache") {
 }
 /**
  * Create the user cache service.

package/dist/internal/userCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"userCache.js","sourceRoot":"","sources":["../../src/internal/userCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAA;AAGjC;;;;GAIG;AACH,MAAM,OAAO,SAAU,SAAQ,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,EA0BlF;CAAG;AAEN;;GAEG;AACH,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAA6B,IAAI,GAAG,EAAE,CAAC,CAAA;IAEpE,MAAM,GAAG,GAAG,CAAC,SAAiB,EAA4C,EAAE,CAC1E,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IAE1D,MAAM,GAAG,GAAG,CAAC,SAAiB,EAAE,IAAmB,EAAuB,EAAE,CAC1E,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;QACtB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAA;QACzB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAC3B,OAAO,MAAM,CAAA;IACf,CAAC,CAAC,CAAA;IAEJ,MAAM,UAAU,GAAG,CACjB,SAAiB,EACjB,KAA6D,EAC5B,EAAE,CACnC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAA;QACf,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QACpC,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAC3B,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;IAEJ,MAAM,KAAK,GAAG,GAAwB,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;IAElE,OAAO,SAAS,CAAC,EAAE,CAAC;QAClB,UAAU;QACV,GAAG;QACH,GAAG;QACH,KAAK;KACN,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAA2B,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA"}
+{"version":3,"file":"userCache.js","sourceRoot":"","sources":["../../src/internal/userCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAA;AAGjC;;;;GAIG;AACH,MAAM,OAAO,SAAU,SAAQ,OAAO,CAAC,OAAO,EA0B3C,CAAC,yCAAyC,CAAC;CAAG;AAEjD;;GAEG;AACH,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAA6B,IAAI,GAAG,EAAE,CAAC,CAAA;IAEpE,MAAM,GAAG,GAAG,CAAC,SAAiB,EAA4C,EAAE,CAC1E,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IAE1D,MAAM,GAAG,GAAG,CAAC,SAAiB,EAAE,IAAmB,EAAuB,EAAE,CAC1E,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;QACtB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAA;QACzB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAC3B,OAAO,MAAM,CAAA;IACf,CAAC,CAAC,CAAA;IAEJ,MAAM,UAAU,GAAG,CACjB,SAAiB,EACjB,KAA6D,EAC5B,EAAE,CACnC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAA;QACf,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QACpC,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAC3B,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;IAEJ,MAAM,KAAK,GAAG,GAAwB,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;IAElE,OAAO,SAAS,CAAC,EAAE,CAAC;QAClB,UAAU;QACV,GAAG;QACH,GAAG;QACH,KAAK;KACN,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAA2B,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@knpkv/confluence-to-markdown",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Sync Confluence Cloud pages to local GitHub Flavored Markdown files",
   "license": "MIT",
   "author": "knpkv",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/knpkv/npm.git",
+    "url": "https://github.com/knpkv/npm.git",
     "directory": "packages/confluence-to-markdown"
   },
   "bugs": {
@@ -18,7 +18,7 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
-    "confluence": "dist/bin.js"
+    "confluence": "./dist/bin.js"
   },
   "exports": {
     ".": {
@@ -85,38 +85,27 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsc",
-    "clean": "rimraf dist dist-test .tsbuildinfo",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:integration": "vitest run --config vitest.config.integration.ts",
-    "lint": "eslint src",
-    "lint:fix": "eslint src --fix",
-    "check": "tsc --noEmit",
-    "link": "npm link"
-  },
   "peerDependencies": {
-    "effect": ">=3.19.3"
+    "effect": "4.0.0-beta.87"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^52.7.1",
-    "@atlaskit/editor-json-transformer": "^8.31.8",
-    "@atlaskit/editor-markdown-transformer": "^5.20.6",
-    "@effect/cli": "latest",
-    "@effect/platform": "latest",
-    "@effect/platform-node": "latest",
-    "@knpkv/confluence-api-client": "workspace:^",
+    "@atlaskit/adf-schema": "^56.0.4",
+    "@atlaskit/editor-json-transformer": "^9.0.1",
+    "@atlaskit/editor-markdown-transformer": "^6.0.1",
+    "@effect/platform-node": "4.0.0-beta.87",
     "ajv": "^8.20.0",
     "ajv-draft-04": "^1.0.0",
-    "gray-matter": "^4.0.3"
+    "js-yaml": "^4.2.0",
+    "@knpkv/agent-skills": "^0.2.0",
+    "@knpkv/confluence-api-client": "^0.3.0"
   },
   "devDependencies": {
-    "@effect/vitest": "^0.27.0",
-    "@types/node": "^22.15.21",
-    "effect": "^3.21.0",
-    "typescript": "~5.9.0",
-    "vitest": "^4.0.13"
+    "@effect/vitest": "4.0.0-beta.87",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^26.0.0",
+    "effect": "4.0.0-beta.87",
+    "typescript": "~6.0.3",
+    "vitest": "^4.1.9"
   },
   "keywords": [
     "effect",
@@ -129,5 +118,16 @@
     "cli",
     "git",
     "version-control"
-  ]
-}
+  ],
+  "scripts": {
+    "build": "tsc",
+    "clean": "rimraf dist dist-test .tsbuildinfo",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:integration": "vitest run --config vitest.config.integration.ts",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
+    "check": "tsc --noEmit",
+    "link": "npm link"
+  }
+}

package/skills/confluence/SKILL.md

@@ -0,0 +1,143 @@
+---
+name: confluence
+description: Use the @knpkv/confluence-to-markdown CLI to clone, fetch, sync, edit, commit, diff, and push Confluence Cloud pages as local GitHub Flavored Markdown. Trigger when the user asks an agent to manage Confluence documentation, inspect local Confluence sync status, create or delete pages, pull remote updates, export a page as markdown, or publish markdown changes back to Confluence.
+---
+
+# Confluence
+
+Use the `confluence` binary to manage a local markdown mirror of Confluence Cloud pages.
+
+## Preconditions
+
+- Run commands from the workspace that contains, or should contain, the `.confluence/` sync directory.
+- Authenticate before clone or sync with `confluence auth create`, `confluence auth configure`, and `confluence auth login`.
+- Use OAuth for normal operation. API-token env vars may be available as `CONFLUENCE_API_KEY` and `CONFLUENCE_EMAIL`.
+- Confirm before running `confluence push`, because it writes to Confluence.
+- Confirm before running `confluence delete`, because it removes a local page that will be deleted remotely on the next push.
+- Treat `confluence fetch --clean-markdown` output as read-only/export output. Do not push it back unless the user explicitly accepts metadata loss.
+
+## Setup
+
+```bash
+confluence auth status
+confluence auth create
+confluence auth configure --client-id <id> --client-secret <secret>
+confluence auth login
+confluence auth login --site https://example.atlassian.net
+```
+
+Clone a page tree:
+
+```bash
+confluence clone --root-page-id <page-id> --base-url https://example.atlassian.net
+confluence clone --url https://example.atlassian.net/wiki/spaces/SPACE/pages/<page-id>/Title
+```
+
+`clone` initializes `.confluence/`, creates local git history, and creates the `origin/confluence` tracking branch.
+
+Fetch one latest page without creating a sync workspace:
+
+```bash
+confluence fetch --url https://example.atlassian.net/wiki/pages/<page-id>
+confluence fetch --page-id <page-id> --base-url https://example.atlassian.net
+confluence fetch --url https://example.atlassian.net/wiki/pages/<page-id> --clean-markdown
+```
+
+## Sync Workflow
+
+Inspect before changing anything:
+
+```bash
+confluence status
+confluence diff
+confluence log --oneline
+```
+
+Pull remote changes:
+
+```bash
+confluence pull
+confluence pull --force
+confluence pull --replay-history
+```
+
+Commit local markdown edits:
+
+```bash
+confluence diff
+confluence commit --message "Update release notes"
+```
+
+Preview and publish:
+
+```bash
+confluence push --dry-run
+confluence push
+```
+
+## Page Operations
+
+Create a page interactively:
+
+```bash
+confluence new
+```
+
+Delete a page locally, then commit and push the deletion:
+
+```bash
+confluence delete
+confluence commit --message "Delete obsolete page"
+confluence push
+```
+
+## Element Fidelity
+
+Confluence pages are stored as Atlassian Document Format (ADF). The CLI emits readable Markdown where possible and exact `<!-- adf:... -->` placeholders/sidecars where Markdown cannot represent the element safely.
+
+Use this quick reference before editing complex pages. It names every ADF element class agents are likely to see in Confluence Cloud, including elements that are only partially supported or currently preserved as placeholders.
+
+| Confluence / ADF element                                                             | Markdown behavior                                                                        | Agent guidance                                                                                                                  |
+| ------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| Document root: `doc`                                                                 | Container only                                                                           | Do not create manually; it is rebuilt on push.                                                                                  |
+| Text leaf: `text`                                                                    | Native Markdown text                                                                     | Safe to edit normally.                                                                                                          |
+| Hard breaks: `hardBreak`                                                             | Markdown hard break; `<br>` inside tables                                                | Safe.                                                                                                                           |
+| Paragraphs: `paragraph`                                                              | Native Markdown paragraph; paragraph marks use `adf:paragraph` wrappers                  | Keep wrappers when alignment or indentation is present.                                                                         |
+| Headings: `heading`                                                                  | `#` through `######`                                                                     | Safe to edit normally.                                                                                                          |
+| Rules: `rule`                                                                        | `---`                                                                                    | Safe.                                                                                                                           |
+| Block quotes: `blockquote`                                                           | Native Markdown blockquotes                                                              | Safe unless nested placeholder markers are present.                                                                             |
+| Code blocks: `codeBlock`                                                             | Fenced code blocks                                                                       | Preserve language fences and fence length.                                                                                      |
+| Inline code mark: `code`                                                             | Backticks                                                                                | Safe.                                                                                                                           |
+| Lists: `bulletList`, `orderedList`, `listItem`                                       | Native Markdown lists                                                                    | Safe unless list items contain tables, layouts, macros, or other placeholder-wrapped blocks.                                    |
+| Tables: `table`, `tableRow`, `tableHeader`, `tableCell`                              | GFM tables wrapped with `adf:table` metadata at block level                              | Avoid restructuring complex tables; merged cells, widths, and some table attrs may not be visible in Markdown.                  |
+| Links: `link` mark                                                                   | Native Markdown links                                                                    | Keep href intact; link titles are preserved when available but may be easy to lose during hand edits.                           |
+| Mentions: `mention`                                                                  | `[@Name](confluence-mention://ACCOUNT_ID)` when account IDs are known                    | Keep the custom link target intact to preserve a real mention.                                                                  |
+| Status lozenges: `status`                                                            | Inline HTML status span                                                                  | Edit label cautiously; keep status attributes intact.                                                                           |
+| Dates: `date`                                                                        | Exact `adf:date` placeholder comments                                                    | Do not hand-edit unless intentionally replacing with plain text.                                                                |
+| Emojis: `emoji`                                                                      | Exact `adf:emoji` placeholder comments                                                   | Do not hand-edit unless intentionally replacing with plain text.                                                                |
+| Panels: `panel`                                                                      | Placeholder-wrapped content                                                              | Edit body text only; keep opening/closing `adf:panel` markers.                                                                  |
+| Tasks: `taskList`, `taskItem`                                                        | Task-list Markdown wrapped with exact ADF metadata                                       | Keep markers/sidecars; state/localId metadata is not fully represented by Markdown.                                             |
+| Decisions: `decisionList`, `decisionItem`                                            | Bullet-like visible text wrapped with exact ADF metadata                                 | Keep markers/sidecars; do not convert to a plain list unless accepting metadata loss.                                           |
+| Expands: `expand`, `nestedExpand`                                                    | Visible title/body wrapped with exact ADF metadata                                       | Keep markers paired; avoid moving only one side of the wrapper.                                                                 |
+| Layouts: `layoutSection`, `layoutColumn`                                             | Visible column content wrapped with exact ADF metadata                                   | Avoid manual reflow unless the user accepts layout loss.                                                                        |
+| Cards: `inlineCard`, `blockCard`, `embedCard`                                        | URL cards when resolvable; otherwise unsupported/placeholder output                      | Do not delete `adf:*Card` refs unless replacing the card.                                                                       |
+| Media blocks: `mediaSingle`, `mediaGroup`, `media`, `caption`                        | Image Markdown when a URL exists; otherwise `adf:media` placeholder; captions as text    | Warn that attachments and media metadata are not fully supported; captions may not round-trip structurally.                     |
+| Inline media: `mediaInline`                                                          | `adf:media` placeholder                                                                  | Treat as unsupported media; preserve the placeholder.                                                                           |
+| Macros/extensions: `extension`, `inlineExtension`, `bodiedExtension`                 | Native syntax for simple TOC; otherwise exact placeholder comments with sidecar metadata | Preserve macro markers. For TOC, `[[toc]]` and `[[toc:min=2,max=4]]` are supported; richer TOC attrs fall back to placeholders. |
+| Text marks: `strong`, `em`, `strike`                                                 | Native Markdown                                                                          | Safe.                                                                                                                           |
+| Text marks: `underline`, `textColor`, `backgroundColor`, `subsup`                    | Inline HTML and/or placeholder metadata                                                  | Keep HTML/attrs intact for round-trip fidelity.                                                                                 |
+| Paragraph marks: `alignment`, `indentation`                                          | `adf:paragraph` wrapper metadata                                                         | Avoid removing wrapper markers.                                                                                                 |
+| Placeholders and Confluence editor-only nodes such as `placeholder`                  | Unsupported placeholder output if encountered                                            | Stop and warn before editing; preserve any emitted marker/comment.                                                              |
+| Unsupported wrappers: `unsupportedBlock`, `unsupportedInline`, `unsupportedFragment` | Unsupported placeholder output if encountered                                            | Stop and warn before editing; these indicate content the CLI cannot faithfully express yet.                                     |
+| Unknown future ADF nodes or marks                                                    | `<!-- unsupported ADF ... -->` output or warning logs                                    | Stop and warn the user before editing; fetch/pull logs may contain details.                                                     |
+
+Clean fetch mode removes `adf:` comments from stdout for readability. It is useful for summaries, exports, and copying text, but it discards data needed for exact push round-trips.
+
+## Agent Workflow
+
+1. Start with `confluence status` and `confluence diff`.
+2. Read and edit markdown files under the configured docs path, usually `.confluence/docs`.
+3. Preserve `<!-- adf:... -->` markers, `.adf.json` sidecars, front matter, and custom Confluence links unless the user explicitly asks for a lossy cleanup.
+4. Use `confluence commit` instead of raw git for normal sync commits so external docs paths are copied into `.confluence/`.
+5. Use `confluence push --dry-run` before `confluence push`.
+6. Mention fidelity limits when editing complex Confluence content: media, cards, macros, panels, task lists, expand sections, layouts, dates, emojis, and some marks may not round-trip exactly.

package/skills/confluence/agents/openai.yaml

@@ -0,0 +1,4 @@
+interface:
+  display_name: "Confluence Markdown CLI"
+  short_description: "Sync and export Confluence pages as markdown"
+  default_prompt: "Use $confluence to clone, fetch, pull, edit, or push Confluence pages as markdown while preserving ADF fidelity markers."