aidp-git
/aidp-git
Operate native Git in an AIDP workspace — branches, checkout, commit/push, pull, merge, rebase, reset, diff, and conflict resolution on workspace git repositories. Use when the user wants to version workspace notebooks/code in Git, manage branches, commit/push changes, or resolve conflicts inside AIDP. Preview GitService API via `oci raw-request`; verify live first.
- Author
- oracle-samples ↗
- Repository
- oracle-aidp-samples ↗
- Licence
- UPL-1.0
- Last repository change
- 26.10.2026
Assessment and security
- Files in this package
- 1
- Scripts
- 0
- HTML comments
- 0
- URLs in SKILL.md
- 2
No signals detected. Repository changed on 26.10.2026, without references to retired models or APIs.
UPL-1.0, otwarta.
What it does and when to use it
Operate native Git in an AIDP workspace — branches, checkout, commit/push, pull, merge, rebase, reset, diff, and conflict resolution on workspace git repositories. Use when the user wants to version workspace notebooks/code in Git, manage branches, commit/push changes, or resolve conflicts inside AIDP. Preview GitService API via `oci raw-request`; verify live first.
Original author description
Operate native Git in an AIDP workspace — branches, checkout, commit/push, pull, merge, rebase, reset, diff, and conflict resolution on workspace git repositories. Use when the user wants to version workspace notebooks/code in Git, manage branches, commit/push changes, or resolve conflicts inside AIDP. Preview GitService API via `oci raw-request`; verify live first.
How it works
- When to use
- Endpoints (workspace + repo scoped; Preview — default 20240831, prefix dataLakes)
- Entry point — register/clone the repo (CreateGitFolderDetails)
- Workflow
- Guardrails
- References
SKILL.md preview
---
name: aidp-git
description: Operate native Git in an AIDP workspace — branches, checkout, commit/push, pull, merge, rebase, reset, diff, and conflict resolution on workspace git repositories. Use when the user wants to version workspace notebooks/code in Git, manage branches, commit/push changes, or resolve conflicts inside AIDP. Preview GitService API via `oci raw-request`; verify live first.
---
# `aidp-git` — native Git in the workspace (Preview)
Drive AIDP's native Git integration over the REST `GitService` API. Self-contained — no MCP and no
`ai-data-engineer-agent` repo required. All calls are `oci raw-request` against the AIDP control plane
(base URL + auth ladder in `references/oci-raw-request.md`).
> **CLI gap (no invented commands):** the official `aidp` CLI v1.0.0 does **not** expose a full
> `GitService` group — only `aidp workspace create-git-folder` exists. Branch / checkout / commit-push /
> pull / merge / rebase / reset / diff / conflict-resolution all stay on the **REST API (Preview, may be
> unprovisioned)**. Do not assume an `aidp git` command exists — see
> [references/aidp-cli-map.md](../../references/aidp-cli-map.md).
> **Preview + verify-first (no-fabrication):** `GitService` is **Preview**. A live read
> (`actions/gitOperationState`) returning `404 NotAuthorizedOrNotFound` in a `20240831` tenancy means
> **GitService is not provisioned** for that env — not that the path is wrong. Confirm the working
> `API_VERSION`/`PATH_PREFIX` with a live read before any mutating op and record it in
> `references/rest-endpoint-map.md`.
## When to use
- "Version my workspace notebooks in Git", "create/checkout a branch", "commit & push", "pull/merge/rebase",
"what changed (diff)", "resolve conflicts" — inside the AIDP workspace.
## Endpoints (workspace + repo scoped; Preview — default `20240831`, prefix `dataLakes`)
Base: `https://aidp.<region>.oci.oraclecloud.com/20240831/dataLakes/<DATALAKE_OCID>/…`
- `GET|PUT /workspaces/{ws}/gitRepositories/{repo}` · `POST|GET …/gitBranches`
- Actions: `POST …/actions/checkOutBranch|commitPush|merge|pull|rebase|reset|resetState|resolveConflicts`
- Read state: `GET …/actions/gitOperationState|gitDiff|gitDiffDetails`
> Default to `20240831` (the live-verified version for this tenancy). Treat `20260430` as a future GA
> target — only try it after a tenancy upgrade, and probe rather than assume.
## Entry point — register/clone the repo (`CreateGitFolderDetails`)
Before any branch/commit op you need a git folder. This is the **one** git operation with a real CLI
command (CLI README "workspace create-git-folder"):
`aidp workspace create-git-folder <DATALAKE_OCID> <WORKSPACE-KEY> --body <JSON>`. Body
(SDK `create_git_folder_details.py:46-62`):
| Field (wire) | Req | Notes |
|---|---|---|
| `folderPath` | ✅ | absolute path of the git folder to create |
| `gitRepositoryUrl` | ✅ | repo URL to clone |
| `branchName` | ✅ | branch to clone/check out |
| `credentialKey` | ✅ | key of stored git credentials (a `GIT_ACCOUNT` user-setting — see `aidp-user-settings` — or a `credentialStore` entry — see `aidp-credentials`) |
| `gitProviderKey` | – | key of the git provider in the provider table |
| `description` | – | short repo description |
Example — **persist to `.aidp/payloads/create-<name>-git-folder.json` and confirm first:**
```json
{
"folderPath": "/Workspace/repos/my-repo",
"gitRepositoryUrl": "https://github.com/org/my-repo.git",
"branchName": "main",
"credentialKey": "<CREDENTIAL_KEY>"
}
```
> Field **names** are confirmed (SDK `attribute_map` + CLI README). The CLI command itself targets
> `workspaces/{ws}` and is the documented path here; the rest of `GitService` (branch/commit/…) stays
> verify-first Preview (`…/gitRepositories` GET returned 404 = not provisioned in this env —
> `references/rest-endpoint-map.md`).
## Workflow
1. Base URL + auth ladder (`references/oci-raw-request.md`). **Verify** with `GET …/actions/gitOperationState`.
A `404 NotAuthorizedOrNotFound` here = GitService Preview not provisioned in this `20240831` env → stop
and tell the user to enable it; do not fabricate success.
2. Branch: `gitBranches` (list/create) → `actions/checkOutBranch`.
3. Inspect: `actions/gitDiff` / `gitDiffDetails` before committing.
4. Commit/push: `actions/commitPush` (message in body). Integrate: `pull`/`merge`/`rebase`.
5. Conflicts: `actions/resolveConflicts`; recover bad state with `reset`/`resetState` (confirm first).
6. Long ops may be async (202) — poll per the shared conventions in `references/oci-raw-request.md`.
## Guardrails
- `reset`/`resetState`/force-style ops are destructive — show what will be lost and confirm.
- Don't commit secrets/`.env`.
- For mutating ops (commitPush / merge / rebase / reset / resolveConflicts), persist the request body to
`.aidp/payloads/` and confirm first — see [references/payloads.md](../../references/payloads.md).
## References
- [references/aidp-cli-map.md](../../references/aidp-cli-map.md) — official `aidp` CLI v1.0.0 has no full GitService group (only `workspace create-git-folder`)
- [references/oci-raw-request.md](../../references/oci-raw-request.md) · [references/rest-endpoint-map.md](../../references/rest-endpoint-map.md)
- [references/payloads.md](../../references/payloads.md) — persist + confirm request bodies for mutating ops
Versions
| Repository | Score | Licence |
|---|---|---|
| This page · oracle-samples/oracle-aidp-samples | 100 | UPL-1.0 |
| oracle-samples/oracle-aidp-samples | 100 | UPL-1.0 |
Database snapshot: 13.11.2026 · package version f7f14a720710 (SHA-256 digest of the entire package)
Downloads in the last 30 days: 0 · ranking
Report a problem with this skill: harmful content, incorrect descriptions or an author’s removal request.
Similar skills
- 100git
Guide for Git operations including commits, branches, rebasing, and conflict resolution. Use when working with version control, creating commits, managing branches, or resolving merge conflicts. - 90git-merge
Integrate branches with merge or rebase, resolve conflicts, and execute an ordinary push when explicitly authorized. Use for guided integration with optional conflict-review pauses. - 100git-workflow
Comprehensive Git workflow skill for committing, branching, PRs, code review, and repo maintenance. Trigger on: "commit", "push", "create a PR", "open a pull request", "code review", "clean branches", "gone branches", "merge", "branch", "git", "stash", "rebase", or any request… - 100git-workflow
Writes commit messages, manages branches, and opens pull requests with summaries. Use when the user asks to commit, push, branch, or create a PR, and before any destructive git operation such as reset, rebase, or force-push. - 100git
Git version control essentials and best practices. Use when working with git repositories, commits, branches, merges, rebases, remotes, or resolving conflicts. Triggers on git commands, branch operations, merge/rebase questions, or version control workflows. - 90Git Workflow
Trunk-based git workflow for NXTG-Forge — branching strategy, commit conventions, PR practices, rebase/conflict resolution, and how the plugin's own hooks guard git operations. Use when creating a feature branch, writing a commit message or PR, rebasing onto main, resolving…