jonsoc 1.1.49 → 1.1.51

package/bin/jonsoc

@@ -204,7 +204,7 @@ const version = (() => {
   return typeof data.version === "string" ? data.version : "latest"
 })()
 
-const repo = (process.env.JONSOC_REPO ?? process.env.OPENCODE_REPO ?? "Noisemaker111/JonsOpencode").replace(
+const repo = (process.env.JONSOC_REPO ?? process.env.OPENCODE_REPO ?? "Noisemaker111/Jonsoc").replace(
   /^https?:\/\/github\.com\//,
   "",
 )
@@ -253,7 +253,15 @@ function extractArchive(archivePath) {
   if (code !== 0) process.exit(code)
 }
 
+function bundledBinary() {
+  const bundle = join(pkgDir, "..", base, "bin", binary)
+  if (!existsSync(bundle)) return
+  return bundle
+}
+
 function ensureBinary() {
+  const bundle = bundledBinary()
+  if (bundle) return bundle
   if (versionMatch()) return binaryPath
   ensureDir(binDir)
   const { asset, url } = releaseUrl()

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.1.49",
+  "version": "1.1.51",
   "name": "jonsoc",
   "description": "AI-powered development tool - an open source fork of OpenCode (opencode.ai)",
   "type": "module",
@@ -39,9 +39,9 @@
     "jonsoc": "./bin/jonsoc"
   },
   "optionalDependencies": {
-    "jonsoc-darwin-arm64": "1.1.49",
-    "jonsoc-linux-x64": "1.1.49",
-    "jonsoc-windows-x64": "1.1.49"
+    "jonsoc-darwin-arm64": "1.1.51",
+    "jonsoc-linux-x64": "1.1.51",
+    "jonsoc-windows-x64": "1.1.51"
   },
   "exports": {
     "./*": "./src/*.ts"
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "7.28.4",
     "@octokit/webhooks-types": "7.6.1",
-    "@jonsoc/script": "1.1.49",
+    "@jonsoc/script": "1.1.51",
     "@parcel/watcher-darwin-arm64": "2.5.1",
     "@parcel/watcher-darwin-x64": "2.5.1",
     "@parcel/watcher-linux-arm64-glibc": "2.5.1",
@@ -96,10 +96,10 @@
     "@gitlab/gitlab-ai-provider": "3.2.0",
     "@hono/standard-validator": "0.1.5",
     "@hono/zod-validator": "0.4.2",
-    "@jonsoc/plugin": "1.1.49",
-    "@jonsoc/script": "1.1.49",
-    "@jonsoc/sdk": "1.1.49",
-    "@jonsoc/util": "1.1.49",
+    "@jonsoc/plugin": "1.1.51",
+    "@jonsoc/script": "1.1.51",
+    "@jonsoc/sdk": "1.1.51",
+    "@jonsoc/util": "1.1.51",
     "@modelcontextprotocol/sdk": "1.25.2",
     "@octokit/graphql": "9.0.2",
     "@octokit/rest": "22.0.0",

package/postinstall.mjs

@@ -0,0 +1,15 @@
+import { arch, platform } from "os"
+
+const osMap = {
+  win32: "windows",
+  darwin: "darwin",
+  linux: "linux",
+}
+
+const os = osMap[platform()] ?? platform()
+const cpu = arch()
+const pkgName = `jonsoc-${os}-${cpu}`
+
+if (process.env.JONSOC_DEBUG_POSTINSTALL === "1") {
+  console.log(`[jonsoc] optional dependency: ${pkgName}`)
+}

package/script/publish.ts

@@ -2,10 +2,11 @@
 import { $ } from "bun"
 import pkg from "../package.json"
 import { Script } from "@jonsoc/script"
+import { existsSync } from "fs"
 import { fileURLToPath } from "url"
 import path, { dirname, join } from "path"
 
-const dir = fileURLToPath(new URL("..", import.meta.url))
+const dir = dirname(dirname(fileURLToPath(import.meta.url)))
 process.chdir(dir)
 
 const { binaries } = await import("./build.ts")
@@ -26,6 +27,11 @@ if (process.platform === "win32") {
   await $`cp -r ./bin ./dist/${pkg.name}/bin`
 }
 
+const postinstallPath = join(dir, "postinstall.mjs")
+if (existsSync(postinstallPath)) {
+  await Bun.write(join("dist", pkg.name, "postinstall.mjs"), Bun.file(postinstallPath))
+}
+
 await Bun.file(`./dist/${pkg.name}/package.json`).write(
   JSON.stringify(
     {
@@ -45,6 +51,10 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
 )
 
 const tags = [Script.channel]
+const skipDocker = process.env.JONSOC_SKIP_DOCKER === "1" || process.env.OPENCODE_SKIP_DOCKER === "1"
+const skipArchive =
+  process.env.JONSOC_SKIP_ARCHIVE === "1" || process.env.OPENCODE_SKIP_ARCHIVE === "1" || process.platform === "win32"
+const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
 const otp = process.argv.find((arg) => arg.startsWith("--otp="))?.split("=")[1]
 const tokenFlag = process.argv.find((arg) => arg.startsWith("--token="))?.split("=")[1]
 const npmToken = tokenFlag || process.env.NPM_TOKEN
@@ -64,14 +74,23 @@ for (const [name] of Object.entries(binaries)) {
   await $`bun pm pack`.cwd(targetDir)
   const otpArg = otp ? `--otp=${otp}` : ""
   for (const tag of tags) {
-    try {
-      await $`npm publish *.tgz --access public --tag ${tag} ${otpArg}`.cwd(targetDir)
-    } catch (e: any) {
-      if (e.stderr?.toString().includes("previously published versions")) {
-        console.log(`  Already published ${name}. Skipping...`)
-        continue
+    for (const attempt of [1, 2, 3]) {
+      try {
+        await $`npm publish *.tgz --access public --tag ${tag} ${otpArg}`.cwd(targetDir)
+        break
+      } catch (e: any) {
+        const stderr = e.stderr?.toString() ?? ""
+        if (stderr.includes("previously published versions")) {
+          console.log(`  Already published ${name}. Skipping...`)
+          break
+        }
+        if (stderr.includes("E409") && attempt < 3) {
+          console.log(`  npm publish conflict for ${name}. Retrying...`)
+          await sleep(5000)
+          continue
+        }
+        throw e
       }
-      throw e
     }
   }
 }
@@ -85,24 +104,44 @@ for (const tag of tags) {
   }
 
   const otpArg = otp ? `--otp=${otp}` : ""
-  await $`cd ${mainPkgDir} && bun pm pack && npm publish *.tgz --access public --tag ${tag} ${otpArg}`
+  await $`bun pm pack`.cwd(mainPkgDir)
+  for (const attempt of [1, 2, 3]) {
+    try {
+      await $`npm publish *.tgz --access public --tag ${tag} ${otpArg}`.cwd(mainPkgDir)
+      break
+    } catch (e: any) {
+      const stderr = e.stderr?.toString() ?? ""
+      if (stderr.includes("previously published versions")) {
+        console.log(`  Already published ${pkg.name}. Skipping...`)
+        break
+      }
+      if (stderr.includes("E409") && attempt < 3) {
+        console.log(`  npm publish conflict for ${pkg.name}. Retrying...`)
+        await sleep(5000)
+        continue
+      }
+      throw e
+    }
+  }
 }
 
-if (!Script.preview) {
+if (!Script.preview && !skipArchive) {
   // Create archives for GitHub release
   for (const key of Object.keys(binaries)) {
     if (key.includes("linux")) {
       await $`tar -czf ../../${key}.tar.gz *`.cwd(`dist/${key}/bin`)
-    } else {
-      await $`zip -r ../../${key}.zip *`.cwd(`dist/${key}/bin`)
+      continue
     }
+    await $`zip -r ../../${key}.zip *`.cwd(`dist/${key}/bin`)
   }
+}
 
-  const repo = (process.env.JOC_REPO ?? process.env.OPENCODE_REPO ?? "Noisemaker111/Jonsoc").replace(
+if (!Script.preview && !skipDocker) {
+  const repo = (process.env.JONSOC_REPO ?? process.env.OPENCODE_REPO ?? "Noisemaker111/Jonsoc").replace(
     /^https?:\/\/github\.com\//,
     "",
   )
-  const image = process.env.JOC_IMAGE ?? `ghcr.io/${repo}`
+  const image = process.env.JONSOC_IMAGE ?? `ghcr.io/${repo}`
   const platforms = "linux/amd64,linux/arm64"
   const tags = [`${image}:${Script.version}`, `${image}:latest`]
   const tagFlags = tags.flatMap((t) => ["-t", t])

package/src/agent/agent.ts

@@ -67,8 +67,6 @@ export namespace Agent {
         [path.join(os.homedir(), ".jonsoc", "commands", "*")]: "allow",
         [".jonsoc/skills/*"]: "allow",
         [".jonsoc/commands/*"]: "allow",
-        [".jonsoc/skills/*"]: "allow",
-        [".jonsoc/commands/*"]: "allow",
       },
       question: "deny",
       plan_enter: "deny",

package/src/cli/cmd/github.ts

@@ -261,7 +261,6 @@ export const GithubInstallCommand = cmd({
 
           async function promptProvider() {
             const priority: Record<string, number> = {
-              jonsoc: 0,
               jonsoc: 0,
               anthropic: 1,
               openai: 2,

package/src/cli/cmd/import.ts

@@ -32,15 +32,15 @@ export const ImportCommand = cmd({
       const isUrl = args.file.startsWith("http://") || args.file.startsWith("https://")
 
       if (isUrl) {
-        const urlMatch = args.file.match(/https?:\/\/opncd\.ai\/share\/([a-zA-Z0-9_-]+)/)
+        const urlMatch = args.file.match(new RegExp(`https?://${Brand.DOMAIN}/share/([a-zA-Z0-9_-]+)`))
         if (!urlMatch) {
-          process.stdout.write(`Invalid URL format. Expected: https://joc.ai/share/<slug>`)
+          process.stdout.write(`Invalid URL format. Expected: ${Brand.DOMAIN_WITH_PROTOCOL}/share/<slug>`)
           process.stdout.write(EOL)
           return
         }
 
         const slug = urlMatch[1]
-        const response = await fetch(`https://joc.ai/api/share/${slug}`)
+        const response = await fetch(`${Brand.DOMAIN_WITH_PROTOCOL}/api/share/${slug}`)
 
         if (!response.ok) {
           process.stdout.write(`Failed to fetch share data: ${response.statusText}`)

package/src/cli/cmd/tui/context/theme.tsx

@@ -161,7 +161,6 @@ export const DEFAULT_THEMES: Record<string, ThemeJson> = {
   ["one-dark"]: onedark,
   ["osaka-jade"]: osakaJade,
   jonsoc,
-  jonsoc: jonsoc,
   orng,
   ["lucent-orng"]: lucentOrng,
   palenight,

package/src/share/share-next.ts

@@ -7,12 +7,13 @@ import { MessageV2 } from "@/session/message-v2"
 import { Storage } from "@/storage/storage"
 import { Log } from "@/util/log"
 import type * as SDK from "@jonsoc/sdk/v2"
+import { Brand } from "@/brand"
 
 export namespace ShareNext {
   const log = Log.create({ service: "share-next" })
 
   async function url() {
-    return Config.get().then((x) => x.enterprise?.url ?? "https://joc.ai")
+    return Config.get().then((x) => x.enterprise?.url ?? Brand.DOMAIN_WITH_PROTOCOL)
   }
 
   const disabled =